summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--textproc/soothsayer/Makefile9
-rw-r--r--textproc/soothsayer/files/patch-src__lib__core__profileManager.cpp11
-rw-r--r--textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp11
-rw-r--r--textproc/soothsayer/files/patch-src_lib_core_utility.cpp (renamed from textproc/soothsayer/files/patch-src__lib__core__utility.cpp)7
-rw-r--r--textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp10
-rw-r--r--textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp10
-rw-r--r--textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp10
-rw-r--r--textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp10
-rw-r--r--textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp10
-rw-r--r--textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp10
-rw-r--r--textproc/soothsayer/files/patch-src_tools_text2ngram.cpp10
11 files changed, 90 insertions, 18 deletions
diff --git a/textproc/soothsayer/Makefile b/textproc/soothsayer/Makefile
index c6b794cd18c8..e81d602d938e 100644
--- a/textproc/soothsayer/Makefile
+++ b/textproc/soothsayer/Makefile
@@ -3,7 +3,7 @@
PORTNAME= soothsayer
PORTVERSION= 0.6.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/presage/${PORTNAME}/${PORTVERSION}
@@ -14,7 +14,7 @@ LICENSE= GPLv2+
BUILD_DEPENDS= help2man:misc/help2man
-USES= libtool pkgconfig sqlite
+USES= libtool localbase ncurses pkgconfig sqlite
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \
ac_cv_path_PYTHON=no \
@@ -25,16 +25,17 @@ CONFIGURE_ARGS= --disable-python-binding --localstatedir="${PREFIX}/var"
INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+MAKE_JOBS_UNSAFE= yes
post-patch:
@${REINPLACE_CMD} -e 's|\$$\^|$${.ALLSRC}| ; \
s|lib/soothsayer|soothsayer|g' ${WRKSRC}/resources/Makefile.in
@${REINPLACE_CMD} -e 's|lib/soothsayer|soothsayer|' \
+ -e 's@lcurses@lncurses@g' \
${WRKSRC}/resources/profiles/Makefile.in
@${REINPLACE_CMD} -E -e "s|(LIBS=.*)-lsqlite3(.*)|\1\`pkg-config --static --libs sqlite3\`\2|" \
-e "s|(.*SQLITE_LIBS=.*)-lsqlite3(.*)|\1\`pkg-config --static --libs sqlite3\`\2|" \
+ -e 's@lcurses@lncurses@g' \
${WRKSRC}/configure
.include <bsd.port.mk>
diff --git a/textproc/soothsayer/files/patch-src__lib__core__profileManager.cpp b/textproc/soothsayer/files/patch-src__lib__core__profileManager.cpp
deleted file mode 100644
index ef705eb67b5b..000000000000
--- a/textproc/soothsayer/files/patch-src__lib__core__profileManager.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/core/profileManager.cpp.orig 2013-12-24 19:38:41.000000000 +0200
-+++ src/lib/core/profileManager.cpp 2013-12-24 19:39:06.000000000 +0200
-@@ -31,6 +31,8 @@
- #endif
-
- #include <stdlib.h>
-+#include <unistd.h>
-+#include <sys/types.h>
-
- /** Constructor.
- *
diff --git a/textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp b/textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp
new file mode 100644
index 000000000000..4a1593a20b4e
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_lib_core_profileManager.cpp
@@ -0,0 +1,11 @@
+--- src/lib/core/profileManager.cpp.orig 2008-06-02 13:29:06 UTC
++++ src/lib/core/profileManager.cpp
+@@ -31,6 +31,8 @@
+ #endif
+
+ #include <stdlib.h>
++#include <unistd.h>
++#include <sys/types.h>
+
+ /** Constructor.
+ *
diff --git a/textproc/soothsayer/files/patch-src__lib__core__utility.cpp b/textproc/soothsayer/files/patch-src_lib_core_utility.cpp
index 32d1834826a3..04350495200d 100644
--- a/textproc/soothsayer/files/patch-src__lib__core__utility.cpp
+++ b/textproc/soothsayer/files/patch-src_lib_core_utility.cpp
@@ -1,10 +1,11 @@
---- ./src/lib/core/utility.cpp.orig 2013-12-24 19:36:58.000000000 +0200
-+++ ./src/lib/core/utility.cpp 2013-12-24 19:37:26.000000000 +0200
-@@ -22,6 +22,7 @@
+--- src/lib/core/utility.cpp.orig 2008-06-02 13:29:06 UTC
++++ src/lib/core/utility.cpp
+@@ -22,6 +22,8 @@
**********(*)*/
#include "utility.h"
+#include <cstdlib>
++#include <cstring>
/** Convert string to lower case
diff --git a/textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp b/textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp
new file mode 100644
index 000000000000..94ba4d7e0588
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_lib_plugins_plugin.cpp
@@ -0,0 +1,10 @@
+--- src/lib/plugins/plugin.cpp.orig 2008-06-02 13:29:01 UTC
++++ src/lib/plugins/plugin.cpp
+@@ -22,6 +22,7 @@
+ **********(*)*/
+
+ #include "plugins/plugin.h"
++#include <cstdlib>
+
+ /** Creates a plugin object.
+ *
diff --git a/textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp b/textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp
new file mode 100644
index 000000000000..7374958fe4a4
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_lib_plugins_smoothedCountPlugin.cpp
@@ -0,0 +1,10 @@
+--- src/lib/plugins/smoothedCountPlugin.cpp.orig 2008-06-02 13:29:01 UTC
++++ src/lib/plugins/smoothedCountPlugin.cpp
+@@ -22,6 +22,7 @@
+ **********(*)*/
+
+ #include "plugins/smoothedCountPlugin.h"
++#include <cstring>
+
+
+ SmoothedCountPlugin::SmoothedCountPlugin(Configuration* config, ContextTracker* ct)
diff --git a/textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp b/textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp
new file mode 100644
index 000000000000..c3edf463dc72
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_lib_plugins_smoothedNgramPlugin.cpp
@@ -0,0 +1,10 @@
+--- src/lib/plugins/smoothedNgramPlugin.cpp.orig 2008-06-02 13:29:01 UTC
++++ src/lib/plugins/smoothedNgramPlugin.cpp
+@@ -23,6 +23,7 @@
+
+ #include "plugins/smoothedNgramPlugin.h"
+ #include <sstream>
++#include <algorithm>
+
+
+ SmoothedNgramPlugin::SmoothedNgramPlugin(Configuration* config, ContextTracker* ct)
diff --git a/textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp b/textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp
new file mode 100644
index 000000000000..645370b319f2
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_tools_soothsayerDemo.cpp
@@ -0,0 +1,10 @@
+--- src/tools/soothsayerDemo.cpp.orig 2008-06-02 13:29:00 UTC
++++ src/tools/soothsayerDemo.cpp
+@@ -36,6 +36,7 @@
+
+ #include <iostream>
+ #include <sstream>
++#include <cstdlib>
+ #include <getopt.h>
+ #include <list>
+
diff --git a/textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp b/textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp
new file mode 100644
index 000000000000..a75decc54cd3
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_tools_soothsayerDemoText.cpp
@@ -0,0 +1,10 @@
+--- src/tools/soothsayerDemoText.cpp.orig 2008-06-02 13:29:00 UTC
++++ src/tools/soothsayerDemoText.cpp
+@@ -26,6 +26,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <getopt.h>
++#include <cstdlib>
+
+ const char PROGRAM_NAME[] = "soothsayerDemoText";
+
diff --git a/textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp b/textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp
new file mode 100644
index 000000000000..b6f052fcff9b
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_tools_soothsayerSimulator.cpp
@@ -0,0 +1,10 @@
+--- src/tools/soothsayerSimulator.cpp.orig 2008-06-02 13:29:00 UTC
++++ src/tools/soothsayerSimulator.cpp
+@@ -23,6 +23,7 @@
+
+ #include <iostream>
+ #include <fstream>
++#include <cstdlib>
+ #include <string.h>
+
+ #include <getopt.h>
diff --git a/textproc/soothsayer/files/patch-src_tools_text2ngram.cpp b/textproc/soothsayer/files/patch-src_tools_text2ngram.cpp
new file mode 100644
index 000000000000..68b6e60b89f8
--- /dev/null
+++ b/textproc/soothsayer/files/patch-src_tools_text2ngram.cpp
@@ -0,0 +1,10 @@
+--- src/tools/text2ngram.cpp.orig 2008-06-02 13:29:00 UTC
++++ src/tools/text2ngram.cpp
+@@ -29,6 +29,7 @@
+ #include <list>
+ #include <string>
+ #include <map>
++#include <cstdlib>
+
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>