summaryrefslogtreecommitdiff
path: root/sysutils/replicant/files
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/replicant/files')
-rw-r--r--sysutils/replicant/files/patch-Makefile.in11
-rw-r--r--sysutils/replicant/files/patch-common_packing.cc20
-rw-r--r--sysutils/replicant/files/patch-daemon_object_manager.cc14
3 files changed, 0 insertions, 45 deletions
diff --git a/sysutils/replicant/files/patch-Makefile.in b/sysutils/replicant/files/patch-Makefile.in
deleted file mode 100644
index 8876c3bc05d3..000000000000
--- a/sysutils/replicant/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2013-05-14 12:08:06.731909984 +0000
-+++ Makefile.in 2013-05-14 12:08:13.759911180 +0000
-@@ -497,7 +497,7 @@
- daemon/object_manager.cc \
- daemon/settings.cc
-
--replicant_daemon_LDADD = $(E_LIBS) $(BUSYBEE_LIBS) -lglog -lleveldb -ldl -lpthread libreplicant-state-machine.la
-+replicant_daemon_LDADD = $(E_LIBS) $(BUSYBEE_LIBS) -lglog -lleveldb -lpthread libreplicant-state-machine.la
- libreplicant_la_CXXFLAGS = $(CXXFLAGS) $(AM_CXXFLAGS)
- libreplicant_la_SOURCES = \
- common/bootstrap.cc \
diff --git a/sysutils/replicant/files/patch-common_packing.cc b/sysutils/replicant/files/patch-common_packing.cc
deleted file mode 100644
index 64f3268e384d..000000000000
--- a/sysutils/replicant/files/patch-common_packing.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- common/packing.cc.orig 2013-05-14 11:51:52.766912852 +0000
-+++ common/packing.cc 2013-05-14 11:56:57.204910871 +0000
-@@ -50,7 +50,7 @@
- rhs.pack(&sa, 0);
- #ifdef _MSC_VER
- memmove(data, &sa.sin6_addr.u.Byte, 16);
--#elif defined __APPLE__
-+#elif defined __APPLE__ || defined __FreeBSD__
- memmove(data, &sa.sin6_addr.__u6_addr.__u6_addr8, 16);
- #else
- memmove(data, &sa.sin6_addr.__in6_u.__u6_addr8, 16);
-@@ -90,7 +90,7 @@
- in6_addr ia;
- #ifdef _MSC_VER
- memmove(ia.u.Byte, rem.data(), 16);
--#elif defined __APPLE__
-+#elif defined __APPLE__ || defined __FreeBSD__
- memmove(ia.__u6_addr.__u6_addr8, rem.data(), 16);
- #else
- memmove(ia.__in6_u.__u6_addr8, rem.data(), 16);
diff --git a/sysutils/replicant/files/patch-daemon_object_manager.cc b/sysutils/replicant/files/patch-daemon_object_manager.cc
deleted file mode 100644
index 4f1a4a332546..000000000000
--- a/sysutils/replicant/files/patch-daemon_object_manager.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- daemon/object_manager.cc.orig 2013-05-14 11:57:51.191911826 +0000
-+++ daemon/object_manager.cc 2013-05-14 12:00:23.328908089 +0000
-@@ -60,7 +60,10 @@
- #include "daemon/object_manager.h"
- #include "daemon/replicant_state_machine.h"
- #include "daemon/replicant_state_machine_context.h"
--#if defined __APPLE__
-+#if defined __APPLE__ || defined __FreeBSD__
-+#ifdef __FreeBSD__
-+#include <sys/stat.h>
-+#endif
- #include "daemon/memstream.h"
- #endif
-