diff options
author | jaapb <jaapb@pkgsrc.org> | 2012-12-15 16:50:05 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2012-12-15 16:50:05 +0000 |
commit | b29dfbda93778bb571c1bd64a572a6b3eac5ad3e (patch) | |
tree | 6aa55315245e05474d222d6746b89ff31b51c6b5 /time/wyrd | |
parent | 926943d023a68ec898eaa452f5279e9b923c4f93 (diff) | |
download | pkgsrc-b29dfbda93778bb571c1bd64a572a6b3eac5ad3e.tar.gz |
Updated time/wyrd to version 1.4.5 and added a patch to fix OCaml
version detection (thanks to John Marino for reporting this).
Changes from 1.4.1 include:
* Switched from personal fork of OCaml curses bindings to the
community-maintained library from
http://www.nongnu.org/ocaml-tmk/ .
* Fixed bug which prevented "quick add" feature from accepting
UTF-8 encoded text.
* Implemented improved support for Remind's new "reminder
directory" capability.
Fixed an instance of insecure tempfile creation. This
addresses a security vulnerability that had the potential to
cause data loss.
Modified the configure script to support weird locations of
ncurses term.h .
Deprecated the 'calendar_selection' colorable object. For
consistency with the rest of the Wyrd interface, the selected
calendar day is now rendered in reverse video.
Added the 'untimed_bold' configuration variable for selecting
between normal and boldface rendering of untimed reminders.
Added support for remind's 'filedir()' function within INCLUDE
directives, for those who like to
"INCLUDE [filedir()]/some-extra-reminders". Thanks to Stefan
Wehr for the patch.
Implemented more extensive shell-expansion of filenames specified
within wyrdrc, enabling the use of idioms like
'set reminders_file="$DOT_REMINDERS"'.
* Added support for Remind 3.1.0 advance warning of reminders
throughout the Wyrd interface, enabled via the 'advance_warning'
configuration variable.
* Support new Remind 3.1.0 date formatting.
* Added the untimed_window_width rcfile option, which lets the
user set the width of the windows on the right side of the
display.
Tweaked the resize handler so Wyrd does not completely die
when the terminal is resized too small.
Made modifications to support rendering UTF-8 reminders
(requires ncurses built with wide char support)
* Added the home_sticky option, allowing the cursor position
to automatically track the current time.
Added command-line option to append reminders using the
natural language parser.
* Eliminated dependence on Bash-style tilde expansion.
Diffstat (limited to 'time/wyrd')
-rw-r--r-- | time/wyrd/Makefile | 10 | ||||
-rw-r--r-- | time/wyrd/distinfo | 13 | ||||
-rw-r--r-- | time/wyrd/patches/patch-Makefile.in | 18 | ||||
-rw-r--r-- | time/wyrd/patches/patch-aa | 17 | ||||
-rw-r--r-- | time/wyrd/patches/patch-ab | 28 | ||||
-rw-r--r-- | time/wyrd/patches/patch-ac | 13 | ||||
-rw-r--r-- | time/wyrd/patches/patch-configure | 15 |
7 files changed, 44 insertions, 70 deletions
diff --git a/time/wyrd/Makefile b/time/wyrd/Makefile index c548612df45..93a6f7dd12f 100644 --- a/time/wyrd/Makefile +++ b/time/wyrd/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2012/10/08 15:18:25 jaapb Exp $ +# $NetBSD: Makefile,v 1.7 2012/12/15 16:50:05 jaapb Exp $ # -DISTNAME= wyrd-1.4.1 -PKGREVISION= 3 +DISTNAME= wyrd-1.4.5 CATEGORIES= time -MASTER_SITES= http://www.eecs.umich.edu/~pelzlpj/wyrd/ +MASTER_SITES= http://pessimization.com/software/wyrd/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.eecs.umich.edu/~pelzlpj/wyrd/ +HOMEPAGE= http://pessimization.com/software/wyrd/ COMMENT= Text-based front-end to Remind +LICENSE= gnu-gpl-v2 DEPENDS+= remind>=3.00.24:../../time/remind diff --git a/time/wyrd/distinfo b/time/wyrd/distinfo index 3b81ca7990b..1dedf0ea83c 100644 --- a/time/wyrd/distinfo +++ b/time/wyrd/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.2 2008/07/13 20:57:50 tonnerre Exp $ +$NetBSD: distinfo,v 1.3 2012/12/15 16:50:05 jaapb Exp $ -SHA1 (wyrd-1.4.1.tar.gz) = 5d34bdef0ae5a28f47ac7fc927fe60639926a568 -RMD160 (wyrd-1.4.1.tar.gz) = cb6ce509c140f97123a544aaf94d390d59811e9f -Size (wyrd-1.4.1.tar.gz) = 198530 bytes -SHA1 (patch-aa) = d4ad2bbfbc1e493797d4c078863e233b9422b5d3 -SHA1 (patch-ab) = 1e9df7b2ac5adc59937363d957dd9dd97fe8203e -SHA1 (patch-ac) = 4f48b6ce3efc43c39a15c4c05dc4f52cd4f77b11 +SHA1 (wyrd-1.4.5.tar.gz) = 97b6c03ca532e5c209c112f5fb050cafbcecce6d +RMD160 (wyrd-1.4.5.tar.gz) = b7962d9da6b86ec22d8fbd3e4e0632a35cad6850 +Size (wyrd-1.4.5.tar.gz) = 398294 bytes +SHA1 (patch-Makefile.in) = 0dbd5042fa40810a76cb89b677ce3a71ececde9e +SHA1 (patch-configure) = 84b866d7f77787a2bea9def9c1b5169041cc034b diff --git a/time/wyrd/patches/patch-Makefile.in b/time/wyrd/patches/patch-Makefile.in new file mode 100644 index 00000000000..dbdfaddfe68 --- /dev/null +++ b/time/wyrd/patches/patch-Makefile.in @@ -0,0 +1,18 @@ +$NetBSD: patch-Makefile.in,v 1.1 2012/12/15 16:50:05 jaapb Exp $ + +Correctly install configuration files +--- Makefile.in.orig 2010-10-23 18:50:07.000000000 +0000 ++++ Makefile.in +@@ -102,10 +102,10 @@ $(CURSES_CMXA): + + install-indep: + mkdir -p $(BINDIR) +- mkdir -p $(DESTDIR)/$(sysconfdir) + mkdir -p $(MANDIR)/man1 + mkdir -p $(MANDIR)/man5 +- $(INSTALL) -m 644 wyrdrc $(DESTDIR)/$(sysconfdir) ++ mkdir -p $(DESTDIR)/$(prefix)/share/examples/wyrd ++ $(INSTALL) -m 644 wyrdrc $(DESTDIR)/$(prefix)/share/examples/wyrd + $(INSTALL) -m 644 doc/wyrd.1 $(MANDIR)/man1/wyrd.1 + $(INSTALL) -m 644 doc/wyrdrc.5 $(MANDIR)/man5/wyrdrc.5 + diff --git a/time/wyrd/patches/patch-aa b/time/wyrd/patches/patch-aa deleted file mode 100644 index 3b41efbb685..00000000000 --- a/time/wyrd/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2006/07/24 23:03:35 wiz Exp $ - ---- Makefile.in.orig 2006-07-16 22:29:41.000000000 +0000 -+++ Makefile.in -@@ -107,10 +107,10 @@ version.ml: Makefile - - install-indep: - mkdir -p $(BINDIR) -- mkdir -p $(DESTDIR)/$(sysconfdir) - mkdir -p $(MANDIR)/man1 - mkdir -p $(MANDIR)/man5 -- install -m 644 wyrdrc $(DESTDIR)/$(sysconfdir) -+ mkdir -p $(DESTDIR)/$(prefix)/share/examples/wyrd -+ install -m 644 wyrdrc $(DESTDIR)/$(prefix)/share/examples/wyrd - install -m 644 doc/wyrd.1 $(MANDIR)/man1/wyrd.1 - install -m 644 doc/wyrdrc.5 $(MANDIR)/man5/wyrdrc.5 - diff --git a/time/wyrd/patches/patch-ab b/time/wyrd/patches/patch-ab deleted file mode 100644 index 226f8493926..00000000000 --- a/time/wyrd/patches/patch-ab +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2008/07/13 20:57:50 tonnerre Exp $ - ---- interface_main.ml.orig 2006-07-17 00:29:41.000000000 +0200 -+++ interface_main.ml -@@ -884,9 +884,9 @@ let handle_view_keybindings (iface : int - in - Hashtbl.iter find_binding Rcfile.table_commandstr_command; - let sorted_list = List.fast_sort Pervasives.compare !bindings in -- let out_channel = open_out Rcfile.tmpfile in -+ let out_channel = Rcfile.tmpfd in - List.iter (output_string out_channel) sorted_list; -- close_out out_channel; -+ flush out_channel; - def_prog_mode (); - endwin (); - let _ = Unix.system ("less " ^ Rcfile.tmpfile) in -@@ -1640,8 +1640,9 @@ let handle_keypress_normal key (iface : - let i = draw_msg iface in - handle_refresh i reminders - |Rcfile.Quit -> -- let new_iface = {iface with run_wyrd = false} in -- (new_iface, reminders) -+ let out_channel = Rcfile.tmpfd in -+ close_out out_channel;Sys.remove Rcfile.tmpfile;let new_iface = {iface with run_wyrd = false} in -+ (new_iface, reminders) - with Not_found -> - let _ = beep () in - draw_error iface "key is not bound." false; diff --git a/time/wyrd/patches/patch-ac b/time/wyrd/patches/patch-ac deleted file mode 100644 index 24aeff471fd..00000000000 --- a/time/wyrd/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2008/07/13 20:57:50 tonnerre Exp $ - ---- rcfile.ml.orig 2006-07-17 00:29:41.000000000 +0200 -+++ rcfile.ml -@@ -128,7 +128,7 @@ let inverse_color_table = Hashtbl.create - (* Final hash table that maps from object to color_pair index *) - let object_palette = Hashtbl.create 20 - --let tmpfile = "/tmp/wyrd-tmp." ^ (string_of_int (Unix.getuid ())) -+let tmpfile,tmpfd = Filename.open_temp_file "wyrd" "-temp" - - - (* Turn colors on and off *) diff --git a/time/wyrd/patches/patch-configure b/time/wyrd/patches/patch-configure new file mode 100644 index 00000000000..fa387bf0a5c --- /dev/null +++ b/time/wyrd/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2012/12/15 16:50:05 jaapb Exp $ + +Correct faulty ocaml version detection +(patch from https://bugs.launchpad.net/wyrd/+bug/1208142) +--- configure.orig 2010-10-23 18:50:24.000000000 +0000 ++++ configure +@@ -1790,7 +1790,7 @@ OCAMLMAJORVERSION=`echo $OCAMLVERSION | + OCAMLMINORVERSION=`echo $OCAMLVERSION | cut -d '.' -f 2` + if test $OCAMLMAJORVERSION -lt 3 ; then + as_fn_error "Wyrd requires OCaml version 3.08 or greater." "$LINENO" 5 +-else ++elif test $OCAMLMAJORVERSION = 3 ; then + if test $OCAMLMINORVERSION -lt 8 ; then + as_fn_error "Wyrd requires OCaml version 3.08 or greater." "$LINENO" 5 + fi |