2014-06-06 02:22:41 +00:00
|
|
|
require "formula"
|
2010-07-14 21:36:08 +00:00
|
|
|
|
2011-03-10 05:11:03 +00:00
|
|
|
class GnuTypist < Formula
|
2014-06-06 02:22:41 +00:00
|
|
|
homepage "https://www.gnu.org/software/gtypist/"
|
|
|
|
url "http://ftpmirror.gnu.org/gtypist/gtypist-2.9.4.tar.xz"
|
|
|
|
mirror "https://ftp.gnu.org/gnu/gtypist/gtypist-2.9.4.tar.xz"
|
|
|
|
sha256 "18e71d0663af58bee156a749115fb6ead5791068a9f531f9db0ec2782025c5a1"
|
2010-07-14 21:36:08 +00:00
|
|
|
|
2014-06-06 02:22:41 +00:00
|
|
|
depends_on "gettext"
|
2012-06-24 06:14:28 +00:00
|
|
|
|
|
|
|
# Use Apple's ncurses instead of ncursesw.
|
2012-07-09 15:54:03 +00:00
|
|
|
# TODO: use an IFDEF for apple and submit upstream
|
2014-03-19 17:07:51 +00:00
|
|
|
patch :DATA
|
2012-06-24 06:14:28 +00:00
|
|
|
|
2010-07-14 21:36:08 +00:00
|
|
|
def install
|
2012-06-24 06:14:28 +00:00
|
|
|
# libiconv is not linked properly without this
|
2014-06-06 02:22:41 +00:00
|
|
|
ENV.append "LDFLAGS", "-liconv"
|
2012-06-24 06:14:28 +00:00
|
|
|
|
|
|
|
system "./configure", "--disable-dependency-tracking",
|
|
|
|
"--prefix=#{prefix}"
|
|
|
|
system "make"
|
2010-07-14 21:36:08 +00:00
|
|
|
system "make install"
|
|
|
|
end
|
|
|
|
end
|
2012-06-24 06:14:28 +00:00
|
|
|
|
|
|
|
__END__
|
|
|
|
diff --git a/configure b/configure
|
2014-06-06 02:22:41 +00:00
|
|
|
index 2207b09..915a664 100755
|
2012-06-24 06:14:28 +00:00
|
|
|
--- a/configure
|
|
|
|
+++ b/configure
|
2014-06-06 02:22:41 +00:00
|
|
|
@@ -6301,9 +6301,9 @@ fi
|
|
|
|
done
|
|
|
|
|
|
|
|
|
|
|
|
-# check for libncursesw
|
|
|
|
+# check for libncurses
|
|
|
|
|
|
|
|
-ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
|
|
|
|
+ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
|
|
|
|
if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
|
|
|
|
HAVE_NCURSESW_H=1
|
|
|
|
fi
|
|
|
|
@@ -6315,7 +6315,7 @@ if ${ac_cv_lib_ncursesw_add_wch+:} false; then :
|
2012-06-24 06:14:28 +00:00
|
|
|
$as_echo_n "(cached) " >&6
|
|
|
|
else
|
|
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
|
|
-LIBS="-lncursesw $LIBS"
|
|
|
|
+LIBS="-lncurses $LIBS"
|
|
|
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
|
|
/* end confdefs.h. */
|
|
|
|
|
2014-06-06 02:22:41 +00:00
|
|
|
@@ -6350,7 +6350,7 @@ if test "x$ac_cv_lib_ncursesw_add_wch" = xyes; then :
|
2012-06-24 06:14:28 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if test -n "$HAVE_NCURSESW_H" -a -n "$HAVE_LIBNCURSESW"; then
|
|
|
|
- LIBS="-lncursesw $LIBS"
|
|
|
|
+ LIBS="-lncurses $LIBS"
|
|
|
|
else
|
|
|
|
echo -e "Error: both library and header files for the ncursesw library\n"\
|
2014-06-06 02:22:41 +00:00
|
|
|
"are required to build this package. See INSTALL file for"\
|
|
|
|
@@ -10553,4 +10553,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
|
|
|
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
|
|
|
|
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
|
|
|
|
fi
|
|
|
|
-
|
2012-06-24 06:14:28 +00:00
|
|
|
diff --git a/src/cursmenu.c b/src/cursmenu.c
|
|
|
|
index 1c3990e..f0fc21a 100644
|
|
|
|
--- a/src/cursmenu.c
|
|
|
|
+++ b/src/cursmenu.c
|
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
#ifdef HAVE_PDCURSES
|
|
|
|
#include <curses.h>
|
|
|
|
#else
|
|
|
|
-#include <ncursesw/ncurses.h>
|
|
|
|
+#include <ncurses.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "error.h"
|
2014-06-06 02:22:41 +00:00
|
|
|
diff --git a/src/error.c b/src/error.c
|
|
|
|
index 2022f2b..4ab6741 100644
|
|
|
|
--- a/src/error.c
|
|
|
|
+++ b/src/error.c
|
|
|
|
@@ -25,7 +25,7 @@
|
|
|
|
#ifdef HAVE_PDCURSES
|
|
|
|
#include <curses.h>
|
|
|
|
#else
|
|
|
|
-#include <ncursesw/ncurses.h>
|
|
|
|
+#include <ncurses.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
2012-06-24 06:14:28 +00:00
|
|
|
diff --git a/src/gtypist.c b/src/gtypist.c
|
2014-06-06 02:22:41 +00:00
|
|
|
index bd5af8d..b634325 100644
|
2012-06-24 06:14:28 +00:00
|
|
|
--- a/src/gtypist.c
|
|
|
|
+++ b/src/gtypist.c
|
|
|
|
@@ -31,7 +31,7 @@
|
|
|
|
#ifdef HAVE_PDCURSES
|
|
|
|
#include <curses.h>
|
|
|
|
#else
|
|
|
|
-#include <ncursesw/ncurses.h>
|
|
|
|
+#include <ncurses.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <time.h>
|
|
|
|
diff --git a/src/script.c b/src/script.c
|
2014-06-06 02:22:41 +00:00
|
|
|
index ce04d68..f4032e2 100644
|
2012-06-24 06:14:28 +00:00
|
|
|
--- a/src/script.c
|
|
|
|
+++ b/src/script.c
|
|
|
|
@@ -24,7 +24,7 @@
|
|
|
|
#ifdef HAVE_PDCURSES
|
|
|
|
#include <curses.h>
|
|
|
|
#else
|
|
|
|
-#include <ncursesw/ncurses.h>
|
|
|
|
+#include <ncurses.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "error.h"
|
|
|
|
diff --git a/src/utf8.c b/src/utf8.c
|
2014-06-06 02:22:41 +00:00
|
|
|
index 8eab3d3..e3194df 100644
|
2012-06-24 06:14:28 +00:00
|
|
|
--- a/src/utf8.c
|
|
|
|
+++ b/src/utf8.c
|
|
|
|
@@ -23,7 +23,7 @@
|
|
|
|
#ifdef HAVE_PDCURSES
|
|
|
|
#include <curses.h>
|
|
|
|
#else
|
|
|
|
-#include <ncursesw/ncurses.h>
|
|
|
|
+#include <ncurses.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include <stdlib.h>
|