5 files changed, 42 insertions, 66 deletions

diff --git a/comms/trustedqsl/files/patch-Makefile.in b/comms/trustedqsl/files/patch-Makefile.in
deleted file mode 100644
index 36f8aceffdb0..000000000000
--- a/comms/trustedqsl/files/patch-Makefile.in
+++ /dev/null
@@ -1,42 +0,0 @@
---- Makefile.in.orig	2010-09-29 11:41:29.000000000 -0500
-+++ Makefile.in	2012-08-11 18:44:55.000000000 -0500
-@@ -105,9 +105,9 @@
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
--AUTOCONF = @AUTOCONF@
--AUTOHEADER = @AUTOHEADER@
--AUTOMAKE = @AUTOMAKE@
-+AUTOCONF =
-+AUTOHEADER = 
-+AUTOMAKE = 
- AWK = @AWK@
- BUILD = @BUILD@
- CC = @CC@
-@@ -143,7 +143,7 @@
- LTLIBOBJS = @LTLIBOBJS@
- MAKEINFO = @MAKEINFO@
- MKDIR = @MKDIR@
--MKDIR_P = @MKDIR_P@
-+MKDIR_P = /bin/mkdir -p
- OBJEXT = @OBJEXT@
- OPENSSL = @OPENSSL@
- PACKAGE = @PACKAGE@
-@@ -208,7 +208,7 @@
- localedir = @localedir@
- localstatedir = @localstatedir@
- mandir = @mandir@
--mkdir_p = @mkdir_p@
-+mkdir_p = /bin/mkdir
- oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
- platform = @platform@
-@@ -226,7 +226,7 @@
- tqslresources = @tqslresources@
- wxwin_libs = @wxwin_libs@
- WXWIN_STATIC = @wxwin_static@
--WXCONFIG = "$(WXDIR)/bin/wx-config"
-+WXCONFIG = "$(WXDIR)"
- helpdir = $(datadir)
- AM_CXXFLAGS = -Wall `$(WXCONFIG) --cxxflags` -I$(TQSLINC) -I$(ZLIB)/include -I$(EXPAT)/include
- AM_LDFLAGS = -L$(TQSLLIB) -L$(ZLIB)/lib -L$(EXPAT)/lib -L$(OPENSSL)/lib
diff --git a/comms/trustedqsl/files/patch-apps_CMakeLists.txt b/comms/trustedqsl/files/patch-apps_CMakeLists.txt
new file mode 100644
index 000000000000..d827fe019255
--- /dev/null
+++ b/comms/trustedqsl/files/patch-apps_CMakeLists.txt
@@ -0,0 +1,13 @@
+--- apps/CMakeLists.txt.orig	2013-06-25 20:03:58.000000000 -0500
++++ apps/CMakeLists.txt	2013-06-25 20:05:42.000000000 -0500
+@@ -101,5 +101,9 @@
+ install(TARGETS tqsl DESTINATION bin)
+ install(TARGETS tqslcert DESTINATION bin)
+ install(DIRECTORY help DESTINATION share/TrustedQSL)
+-install(FILES trustedqsl.5 DESTINATION share/man/man5)
++if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
++  install(FILES trustedqsl.5 DESTINATION man/man5)
++else()
++  install(FILES trustedqsl.5 DESTINATION share/man/man5)
++endif()
+ endif()
diff --git a/comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake b/comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake
new file mode 100644
index 000000000000..87a3f58bce52
--- /dev/null
+++ b/comms/trustedqsl/files/patch-cmakemodules_FindBDB.cmake
@@ -0,0 +1,18 @@
+--- cmakemodules/FindBDB.cmake.orig	2013-06-23 17:20:25.000000000 -0700
++++ cmakemodules/FindBDB.cmake	2013-06-23 17:24:59.000000000 -0700
+@@ -4,6 +4,7 @@
+ if(APPLE) #exclude obsolete default OSX db
+ FIND_PATH(BDB_INCLUDE_DIR db.h NO_DEFAULT_PATH PATHS
+   "/usr/local/BerkeleyDB.5.3/include"
++  "/usr/local/include/db5"
+   "${BDB_PREFIX}/include"
+ ) 
+ else()
+@@ -26,6 +27,7 @@
+   "C:\\db-5.3.21\\build_windows\\Win32\\Static_Release\\" #vc08 adds underscore
+   #OSX (and probably other unix) src build
+   "/usr/local/BerkeleyDB.5.3/lib"
++  "/usr/local/lib/db5"
+   "${BDB_PREFIX}/lib"
+ )
+ MARK_AS_ADVANCED(BDB_LIBRARY)
diff --git a/comms/trustedqsl/files/patch-configure b/comms/trustedqsl/files/patch-configure
deleted file mode 100644
index 7a72f636f5aa..000000000000
--- a/comms/trustedqsl/files/patch-configure
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.orig	2012-08-11 14:24:17.000000000 -0500
-+++ configure	2012-08-11 14:28:58.000000000 -0500
-@@ -4601,7 +4601,7 @@
- 
- checkwxdir(){
-   if test -z "$WXDIR"; then
--    if test -e "$1/bin/wx-config"; then
-+    if test -e "%%WX_CONFIG%%"; then
-       WXDIR="$1"
-     fi
-   fi
-@@ -4813,10 +4813,10 @@
- fi
- 
- 
--wxwin_libs=`$WXDIR/bin/wx-config --libs`
-+wxwin_libs=`%%WX_CONFIG%% --libs`
- # Check whether --enable-wxwin-static was given.
- if test "${enable_wxwin_static+set}" = set; then
--  enableval=$enable_wxwin_static;  if test "$enableval" = "yes"; then wxwin_libs=`$WXDIR/bin/wx-config --static --libs`; fi
-+  enableval=$enable_wxwin_static;  if test "$enableval" = "yes"; then wxwin_libs=`%%WX_CONFIG%% --static --libs`; fi
- fi
- 
- 
diff --git a/comms/trustedqsl/files/patch-src_tqslconvert.cpp b/comms/trustedqsl/files/patch-src_tqslconvert.cpp
new file mode 100644
index 000000000000..c29ed5624807
--- /dev/null
+++ b/comms/trustedqsl/files/patch-src_tqslconvert.cpp
@@ -0,0 +1,11 @@
+--- src/tqslconvert.cpp.orig	2013-06-23 17:30:50.000000000 -0700
++++ src/tqslconvert.cpp	2013-06-23 17:31:00.000000000 -0700
+@@ -22,7 +22,7 @@
+ #include <vector>
+ #include <ctype.h>
+ #include <set>
+-#include <db.h>
++#include <db5/db.h>
+ 
+ #include <locale.h>
+ //#include <iostream>