3 files changed, 38 insertions, 31 deletions
diff --git a/etc/import/src/TARGETS.git2 b/etc/import/src/TARGETS.git2
index 2e96ce6c..96369d8b 100644
--- a/etc/import/src/TARGETS.git2
+++ b/etc/import/src/TARGETS.git2
@@ -1,7 +1,8 @@
-{ "git2internal":
+{ "libgit2":
   { "type": ["@", "rules", "CC", "library"]
   , "arguments_config": ["OS", "ARCH", "TARGET_ARCH"]
   , "name": ["git2"]
+  , "pkg-name": ["libgit2"]
   , "pure C": ["yes"]
   , "private-defines":
     { "type": "case"
diff --git a/etc/import/src/compiler/TARGETS.grpc b/etc/import/src/compiler/TARGETS.grpc
index 132c58e0..2cb8eb88 100644
--- a/etc/import/src/compiler/TARGETS.grpc
+++ b/etc/import/src/compiler/TARGETS.grpc
@@ -36,8 +36,7 @@
     , "ruby_generator_string-inl.h"
     , "schema_interface.h"
     ]
-  , "deps":
-    [[".", "grpc++_config_proto"], ["@", "protobuf", ".", "protoc_lib"]]
+  , "deps": [[".", "grpc++_config_proto"], ["@", "protobuf", ".", "libprotoc"]]
   }
 , "grpc_cpp_plugin":
   { "type": "export"
diff --git a/etc/import/src/google/protobuf/TARGETS.protobuf b/etc/import/src/google/protobuf/TARGETS.protobuf
index 81ab28ec..495de145 100644
--- a/etc/import/src/google/protobuf/TARGETS.protobuf
+++ b/etc/import/src/google/protobuf/TARGETS.protobuf
@@ -1,4 +1,21 @@
-{ "protobuf_headers":
+{ "well_known_protos":
+  { "type": "install"
+  , "deps":
+    [ "any.proto"
+    , "api.proto"
+    , "compiler/plugin.proto"
+    , "descriptor.proto"
+    , "duration.proto"
+    , "empty.proto"
+    , "field_mask.proto"
+    , "source_context.proto"
+    , "struct.proto"
+    , "timestamp.proto"
+    , "type.proto"
+    , "wrappers.proto"
+    ]
+  }
+, "protobuf_headers":
   { "type": ["@", "rules", "data", "staged"]
   , "srcs":
     [ "any.h"
@@ -229,12 +246,20 @@
     , "wire_format.h"
     , "wire_format_lite.h"
     , "wrappers.pb.h"
+    , "well_known_protos"
     ]
   , "stage": ["google", "protobuf"]
   }
-, "protobuf_lite":
+, "libprotobuf_lite":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["protobuf_lite"]
+  , "name": ["protobuf-lite"]
+  , "cflags":
+    [ "-Wno-sign-compare"
+    , "-Wno-sign-conversion"
+    , "-Wno-unused-function"
+    , "-Wno-zero-length-array"
+    , "-Wno-deprecated-declarations"
+    ]
   , "hdrs": ["protobuf_headers"]
   , "srcs":
     [ "any_lite.cc"
@@ -266,9 +291,10 @@
     , "wire_format_lite.cc"
     ]
   }
-, "protobuf":
+, "libprotobuf":
   { "type": ["@", "rules", "CC", "library"]
   , "name": ["protobuf"]
+  , "hdrs": ["protobuf_headers"]
   , "srcs":
     [ "any.cc"
     , "any.pb.cc"
@@ -323,11 +349,11 @@
     , "wire_format.cc"
     , "wrappers.pb.cc"
     ]
-  , "deps": ["protobuf_lite", ["@", "zlib", "", "zlib"]]
+  , "deps": ["libprotobuf_lite", ["@", "zlib", "", "zlib"]]
   }
-, "protoc_lib":
+, "libprotoc":
   { "type": ["@", "rules", "CC", "library"]
-  , "name": ["protoc_lib"]
+  , "name": ["libprotoc"]
   , "srcs":
     [ "compiler/code_generator.cc"
     , "compiler/command_line_interface.cc"
@@ -411,32 +437,13 @@
     , "compiler/subprocess.cc"
     , "compiler/zip_writer.cc"
     ]
-  , "deps": ["protobuf"]
+  , "deps": ["libprotobuf"]
   }
 , "protoc":
   { "type": ["@", "rules", "CC", "binary"]
   , "name": ["protoc"]
   , "srcs": ["compiler/main.cc"]
-  , "private-deps": ["protoc_lib"]
+  , "private-deps": ["libprotoc"]
   , "private-ldflags": ["-pthread"]
   }
-, "well_known_proto_files":
-  { "type": "install"
-  , "deps":
-    [ "any.proto"
-    , "api.proto"
-    , "compiler/plugin.proto"
-    , "descriptor.proto"
-    , "duration.proto"
-    , "empty.proto"
-    , "field_mask.proto"
-    , "source_context.proto"
-    , "struct.proto"
-    , "timestamp.proto"
-    , "type.proto"
-    , "wrappers.proto"
-    ]
-  }
-, "well_known_protos":
-  {"type": "install", "dirs": [["well_known_proto_files", "google/protobuf"]]}
 }