Added some patches - see bug 107443.

Package-Manager: portage-2.0.52-r1

8 files changed, 221 insertions, 15 deletions

diff --git a/x11-misc/remind/ChangeLog b/x11-misc/remind/ChangeLog
index 648440e099d9..3d7ca8718b8e 100644
--- a/x11-misc/remind/ChangeLog
+++ b/x11-misc/remind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-misc/remind
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/ChangeLog,v 1.9 2005/07/25 20:52:16 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/ChangeLog,v 1.10 2005/10/01 15:41:40 nelchael Exp $
+
+*remind-03.00.23-r2 (01 Oct 2005)
+
+  01 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/3.00.23/01-optional-filename.patch,
+  +files/3.00.23/03-broken-postscript.patch,
+  +files/3.00.23/03-tkremind-no-newlines.patch,
+  +files/3.00.23/04-rem-cmd.patch, +remind-03.00.23-r2.ebuild:
+  Added some patches - see bug 107443.
 
   25 Jul 2005; Jonathan Smith <smithj@gentoo.org> remind-03.00.22.ebuild,
   remind-03.00.23-r1.ebuild:
diff --git a/x11-misc/remind/Manifest b/x11-misc/remind/Manifest
index f43f924bf115..2a884097810c 100644
--- a/x11-misc/remind/Manifest
+++ b/x11-misc/remind/Manifest
@@ -1,16 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 da2636dbd7e085236b52a4f1f9998873 ChangeLog 1229
+MD5 680777d7abd7bf19450a4b9351889fa4 remind-03.00.23-r1.ebuild 732
+MD5 e8328bfbb182a3af016379062cdf7716 remind-03.00.23-r2.ebuild 994
+MD5 45fc24bcff04005f33e4d68201ef312e remind-03.00.22.ebuild 581
+MD5 65fd1692f2bc73c1a8954e1133d8d1dd ChangeLog 1561
+MD5 854ad93ffa90b305b1f1f87592698ed8 metadata.xml 167
 MD5 375c9caf7bde9ce5f35f13bdeda4ca17 files/digest-remind-03.00.22 67
 MD5 e303deb68b9bb5fad91b5fce2901bf56 files/digest-remind-03.00.23-r1 67
-MD5 854ad93ffa90b305b1f1f87592698ed8 metadata.xml 167
-MD5 45fc24bcff04005f33e4d68201ef312e remind-03.00.22.ebuild 581
-MD5 680777d7abd7bf19450a4b9351889fa4 remind-03.00.23-r1.ebuild 732
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC6h7WI1lqEGTUzyQRAqKYAJsG/OSSWOd6o0T/squk/qAzSv4FmQCfe/Th
-sy7casZ8dHRx7GVnAas3jVY=
-=WIae
------END PGP SIGNATURE-----
+MD5 e303deb68b9bb5fad91b5fce2901bf56 files/digest-remind-03.00.23-r2 67
+MD5 f19644c3bde4fb67f73f8a1f92127aa8 files/3.00.23/04-rem-cmd.patch 348
+MD5 9b1b590133c6c87a65a2c529b8e8db15 files/3.00.23/03-tkremind-no-newlines.patch 1013
+MD5 7c5af810d26f0e9c10a5476a82c91fe1 files/3.00.23/01-optional-filename.patch 4493
+MD5 d6c37960f3daba2f5aa9076d0eca4098 files/3.00.23/03-broken-postscript.patch 638
diff --git a/x11-misc/remind/files/3.00.23/01-optional-filename.patch b/x11-misc/remind/files/3.00.23/01-optional-filename.patch
new file mode 100644
index 000000000000..3d130dde0b00
--- /dev/null
+++ b/x11-misc/remind/files/3.00.23/01-optional-filename.patch
@@ -0,0 +1,109 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01-optional-filename.dpatch by René van Bevern <rvb@pro-linux.de>
+##
+## DP: make the filename argument optional. If no filename is given, use
+## DP: ~/.reminders or $DOT_REMINDERS as reminder file. This obsoletes the "rem"
+## DP: script which lead to problems in the past. Read bug #310818 and
+## DP: README.Debian for details.
+
+@DPATCH@
+diff -urNad remind-03.00.23/man/remind.1 /tmp/dpep.W6kDPi/remind-03.00.23/man/remind.1
+--- remind-03.00.23/man/remind.1	2005-05-26 20:06:36.000000000 +0200
++++ /tmp/dpep.W6kDPi/remind-03.00.23/man/remind.1	2005-05-26 20:06:41.000000000 +0200
+@@ -4,7 +4,7 @@
+ .SH NAME
+ remind \- a sophisticated reminder service
+ .SH SYNOPSIS
+-.B remind [\fIoptions\fR] \fIfilename\fR [\fIdate\fR] [\fI*rep\fR] [\fItime\fR]
++.B remind [\fIoptions\fR] [\fIfilename\fR [\fIdate\fR] [\fI*rep\fR] [\fItime\fR] ]
+ .SH DESCRIPTION
+ \fBRemind\fR reads the supplied \fIfilename\fR and executes the commands
+ found in it.  The commands are used to issue reminders and alarms.  Each
+@@ -13,7 +13,9 @@
+ .PP
+ If \fIfilename\fR is specified as a single dash '-', then \fBRemind\fR
+ takes its input from standard input.  This also implicitly enables
+-the \fB\-o\fR option, described below.
++the \fB\-o\fR option, described below. If no filename is given, remind uses
++\fI~/.reminders\fR or the content of the DOT_REMINDERS environment
++variable.
+ .SH OPTIONS
+ \fBRemind\fR has a slew of options.  If you're new to the program,
+ ignore them for now and skip to the section "Reminder Files".
+diff -urNad remind-03.00.23/src/init.c /tmp/dpep.W6kDPi/remind-03.00.23/src/init.c
+--- remind-03.00.23/src/init.c	2005-05-26 20:06:36.000000000 +0200
++++ /tmp/dpep.W6kDPi/remind-03.00.23/src/init.c	2005-05-26 20:07:30.000000000 +0200
+@@ -47,6 +47,8 @@
+ #include "version.h"
+ #include "globals.h"
+ 
++#define DOT_REMINDERS ".reminders"
++
+ /***************************************************************
+  *
+  *  Command line options recognized:
+@@ -105,6 +107,30 @@
+ 
+ /***************************************************************/
+ /*                                                             */
++/*  DefaultReminders                                           */
++/*                                                             */
++/*  Detect a default reminder file                             */
++/*                                                             */
++/***************************************************************/
++
++char* DefaultReminders()
++{
++    char *dot_reminders;
++    char *home;
++    size_t len;
++    if((dot_reminders=getenv("DOT_REMINDERS")))
++	return dot_reminders;
++    else if((home=getenv("HOME"))) {
++	len = strlen(home) + strlen(DOT_REMINDERS) + 2;
++	dot_reminders = (char*)malloc(len);
++	snprintf(dot_reminders, len, "%s/%s", home, DOT_REMINDERS);
++	return dot_reminders;
++    }
++    else return DOT_REMINDERS;
++}
++
++/***************************************************************/
++/*                                                             */
+ /*  InitRemind                                                 */
+ /*                                                             */
+ /*  Initialize the system - called only once at beginning!     */
+@@ -394,11 +420,8 @@
+     }
+ 
+     /* Get the filename. */
+-    if (i >= argc) {
+-	Usage();
+-	exit(1);
+-    }
+-    InitialFile = argv[i++];
++    if (i >= argc) InitialFile = DefaultReminders(); 
++    else InitialFile = argv[i++];
+ 
+     /* Get the date, if any */
+     if (i < argc) {
+@@ -500,7 +523,7 @@
+ #ifdef BETA
+     fprintf(ErrFp, ">>>> BETA VERSION <<<<\n");
+ #endif
+-    fprintf(ErrFp, "Usage: remind [options] filename [date] [time] [*rep]\n");
++    fprintf(ErrFp, "Usage: remind [options] [filename [date] [time] [*rep] ]\n");
+     fprintf(ErrFp, "Options:\n");
+     fprintf(ErrFp, " -n     Output next occurrence of reminders in simple format\n");
+     fprintf(ErrFp, " -r     Disable RUN directives\n");
+diff -urNad remind-03.00.23/src/protos.h /tmp/dpep.W6kDPi/remind-03.00.23/src/protos.h
+--- remind-03.00.23/src/protos.h	2005-05-26 20:06:36.000000000 +0200
++++ /tmp/dpep.W6kDPi/remind-03.00.23/src/protos.h	2005-05-26 20:06:41.000000000 +0200
+@@ -60,6 +60,7 @@
+ int SetAccessDate ARGS ((char *fname, int jul));
+ int TopLevel ARGS ((void));
+ int CallFunc ARGS ((Operator *f, int nargs));
++char* DefaultReminders ARGS ((void));
+ void InitRemind ARGS ((int argc, char *argv[]));
+ void Usage ARGS ((void));
+ int main ARGS ((int argc, char *argv[]));
diff --git a/x11-misc/remind/files/3.00.23/03-broken-postscript.patch b/x11-misc/remind/files/3.00.23/03-broken-postscript.patch
new file mode 100644
index 000000000000..560a9661249d
--- /dev/null
+++ b/x11-misc/remind/files/3.00.23/03-broken-postscript.patch
@@ -0,0 +1,17 @@
+Do not print closing bracket if a "remind -p" entry ends in space
+characters. It is already printed as a part of the invoked finish:
+label, which results in an additional bracket that corrupts the
+generated PostScript.
+				René van Bevern <rvb@pro-linux.de>
+
+diff -Nur remind-03.00.23/src/rem2ps.c remind-03.00.23.new/src/rem2ps.c
+--- remind-03.00.23/src/rem2ps.c	2005-07-29 12:24:53.000000000 +0200
++++ remind-03.00.23.new/src/rem2ps.c	2005-07-29 12:25:05.000000000 +0200
+@@ -643,7 +643,6 @@
+ 	    PutChar(')');
+ 	    while(isspace((unsigned char)*s)) s++;
+ 	    if (!*s) {
+-		printf("]\n");
+ 		goto finish;
+ 	    }
+ 	    PutChar('(');
diff --git a/x11-misc/remind/files/3.00.23/03-tkremind-no-newlines.patch b/x11-misc/remind/files/3.00.23/03-tkremind-no-newlines.patch
new file mode 100644
index 000000000000..76e7db9d4cab
--- /dev/null
+++ b/x11-misc/remind/files/3.00.23/03-tkremind-no-newlines.patch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03-tkremind-no-newlines.dpatch.dpatch by Rene van Bevern <rvb@pro-linux.de>
+##
+## DP: Following patch prevents tkremind from destroying your reminder files
+## DP: with newlines if entered into the body field of the "Add Reminder"
+## DP: dialog.
+
+@DPATCH@
+--- remind-03.00.23.orig/scripts/tkremind	2005-04-19 15:08:46.000000000 +0200
++++ remind-03.00.23/scripts/tkremind	2005-04-28 10:57:08.000000000 +0200
+@@ -1240,7 +1240,8 @@
+ 		lappend ans "-global-$winstem" [eval set $winstem]
+ 	    }
+ 	    "Entry" {
+-		lappend ans "-entry-$winstem" [$win get]
++	    	# Do not put newlines in the reminder files
++		lappend ans "-entry-$winstem" [string map -nocase {"\n" " "} [$win get]]
+ 	    }
+ 	}
+     }
+@@ -1519,7 +1520,8 @@
+ 	regsub -- {^-stdin-\([0-9]*\): } $err {} err
+ 	error "Error from Remind: $err"
+     }
+-    append rem " MSG $body"
++    # Do not include newline characters after MSG
++    append rem " MSG " [string map -nocase {"\n" " "} $body]
+     return $rem
+ }
+ 
diff --git a/x11-misc/remind/files/3.00.23/04-rem-cmd.patch b/x11-misc/remind/files/3.00.23/04-rem-cmd.patch
new file mode 100644
index 000000000000..166c5ddf44eb
--- /dev/null
+++ b/x11-misc/remind/files/3.00.23/04-rem-cmd.patch
@@ -0,0 +1,11 @@
+--- remind-03.00.22.orig/src/dorem.c	2005-04-19 15:08:46.000000000 +0200
++++ remind-03.00.22/src/dorem.c	2005-04-19 21:19:49.000000000 +0200
+@@ -981,7 +981,7 @@
+ 	    }
+ 	}
+     }
+-    if (l >= 0 && DBufPutc(&execBuffer, cmd[l]) != OK) {
++    if (l!=(i-1) && l >= 0 && DBufPutc(&execBuffer, cmd[l]) != OK) {
+ 	r = E_NO_MEM;
+ 	goto finished;
+     }
diff --git a/x11-misc/remind/files/digest-remind-03.00.23-r2 b/x11-misc/remind/files/digest-remind-03.00.23-r2
new file mode 100644
index 000000000000..e008b82fcd61
--- /dev/null
+++ b/x11-misc/remind/files/digest-remind-03.00.23-r2
@@ -0,0 +1 @@
+MD5 32504b3fbc66a1876be900b563efd766 remind-03.00.23.tar.gz 298411
diff --git a/x11-misc/remind/remind-03.00.23-r2.ebuild b/x11-misc/remind/remind-03.00.23-r2.ebuild
new file mode 100644
index 000000000000..08103b39d083
--- /dev/null
+++ b/x11-misc/remind/remind-03.00.23-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/remind/remind-03.00.23-r2.ebuild,v 1.1 2005/10/01 15:41:40 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="Ridiculously functional reminder program"
+HOMEPAGE="http://www.roaringpenguin.com/penguin/open_source_remind.php"
+SRC_URI="http://www.roaringpenguin.com/penguin/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~sparc"
+IUSE="X"
+
+RDEPEND="X? ( virtual/x11
+		dev-lang/tk )"
+
+src_unpack() {
+	unpack "${A}"
+	epatch "${FILESDIR}/${PV}/01-optional-filename.patch"
+	epatch "${FILESDIR}/${PV}/03-broken-postscript.patch"
+	epatch "${FILESDIR}/${PV}/03-tkremind-no-newlines.patch"
+	epatch "${FILESDIR}/${PV}/04-rem-cmd.patch"
+}
+
+src_install() {
+	# stupid broken makefile...
+	einstall || die "first einstall failed"
+	dobin www/rem2html
+
+	dodoc README ACKNOWLEDGEMENTS COPYRIGHT WINDOWS doc/README.UNIX \
+		doc/WHATSNEW* www/README.*
+}