Merge branch 'master' of github.com:vysheng/tg

Conflicts:
	Makefile.tgl

README.md

@@ -69,6 +69,7 @@ If using [Homebrew](http://brew.sh/):
      brew install libconfig
      brew install readline
      brew install lua
+     brew install libevent
      export CFLAGS="-I/usr/local/include -I/usr/local/Cellar/readline/6.3.8/include"
      export LDFLAGS="-L/usr/local/lib -L/usr/local/Cellar/readline/6.3.8/lib"
      ./configure && make

main.c

@@ -29,6 +29,10 @@
 #include <termios.h>
 #include <unistd.h>
 #include <assert.h>
+#ifdef __FreeBSD__
+#include <sys/socket.h>
+#include <netinet/in.h>
+#endif
 #if (READLINE == GNU)
 #include <readline/readline.h>
 #else
@@ -844,7 +848,11 @@ int main (int argc, char **argv) {
   running_for_first_time ();
   parse_config ();
 
+  #ifdef __FreeBSD__
+  tgl_set_rsa_key (TLS, "/usr/local/etc/" PROG_NAME "/server.pub");
+  #else
   tgl_set_rsa_key (TLS, "/etc/" PROG_NAME "/server.pub");
+  #endif
   tgl_set_rsa_key (TLS, "tg-server.pub");