textproc/soothsayer: fix ncurses, missing c++ headers, not jobs safe

This commit is contained in:
John Marino 2016-08-23 15:58:43 +00:00
parent 96aa446b35
commit 21c6f9061b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=420704
11 changed files with 90 additions and 18 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= soothsayer PORTNAME= soothsayer
PORTVERSION= 0.6.3 PORTVERSION= 0.6.3
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= textproc CATEGORIES= textproc
MASTER_SITES= SF/presage/${PORTNAME}/${PORTVERSION} MASTER_SITES= SF/presage/${PORTNAME}/${PORTVERSION}
@ -14,7 +14,7 @@ LICENSE= GPLv2+
BUILD_DEPENDS= help2man:misc/help2man BUILD_DEPENDS= help2man:misc/help2man
USES= libtool pkgconfig sqlite USES= libtool localbase ncurses pkgconfig sqlite
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \ CONFIGURE_ENV= ac_cv_path_CPPUNIT_CONFIG=no \
ac_cv_path_PYTHON=no \ ac_cv_path_PYTHON=no \
@ -25,16 +25,17 @@ CONFIGURE_ARGS= --disable-python-binding --localstatedir="${PREFIX}/var"
INSTALL_TARGET= install-strip INSTALL_TARGET= install-strip
USE_LDCONFIG= yes USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include MAKE_JOBS_UNSAFE= yes
LDFLAGS+= -L${LOCALBASE}/lib
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|\$$\^|$${.ALLSRC}| ; \ @${REINPLACE_CMD} -e 's|\$$\^|$${.ALLSRC}| ; \
s|lib/soothsayer|soothsayer|g' ${WRKSRC}/resources/Makefile.in s|lib/soothsayer|soothsayer|g' ${WRKSRC}/resources/Makefile.in
@${REINPLACE_CMD} -e 's|lib/soothsayer|soothsayer|' \ @${REINPLACE_CMD} -e 's|lib/soothsayer|soothsayer|' \
-e 's@lcurses@lncurses@g' \
${WRKSRC}/resources/profiles/Makefile.in ${WRKSRC}/resources/profiles/Makefile.in
@${REINPLACE_CMD} -E -e "s|(LIBS=.*)-lsqlite3(.*)|\1\`pkg-config --static --libs sqlite3\`\2|" \ @${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|(.*SQLITE_LIBS=.*)-lsqlite3(.*)|\1\`pkg-config --static --libs sqlite3\`\2|" \
-e 's@lcurses@lncurses@g' \
${WRKSRC}/configure ${WRKSRC}/configure
.include <bsd.port.mk> .include <bsd.port.mk>

View file

@ -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.
*

View file

@ -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.
*

View file

@ -1,10 +1,11 @@
--- ./src/lib/core/utility.cpp.orig 2013-12-24 19:36:58.000000000 +0200 --- src/lib/core/utility.cpp.orig 2008-06-02 13:29:06 UTC
+++ ./src/lib/core/utility.cpp 2013-12-24 19:37:26.000000000 +0200 +++ src/lib/core/utility.cpp
@@ -22,6 +22,7 @@ @@ -22,6 +22,8 @@
**********(*)*/ **********(*)*/
#include "utility.h" #include "utility.h"
+#include <cstdlib> +#include <cstdlib>
+#include <cstring>
/** Convert string to lower case /** Convert string to lower case

View file

@ -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.
*

View file

@ -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)

View file

@ -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)

View file

@ -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>

View file

@ -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";

View file

@ -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>

View file

@ -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>