summaryrefslogtreecommitdiff
path: root/time/pcal
diff options
context:
space:
mode:
authordholland <dholland>2010-04-29 00:17:14 +0000
committerdholland <dholland>2010-04-29 00:17:14 +0000
commit446487e71c5fa3946bd8a346c3bed08769e39ede (patch)
tree0c63e9cdd6deecc33c986bb3d272b1e9f6c4a9f4 /time/pcal
parent5a17657370b0471776ae8017a607e083bc595331 (diff)
downloadpkgsrc-446487e71c5fa3946bd8a346c3bed08769e39ede.tar.gz
fix getline -> get_line for -current (thank you POSIX)
Diffstat (limited to 'time/pcal')
-rw-r--r--time/pcal/distinfo8
-rw-r--r--time/pcal/patches/patch-af22
-rw-r--r--time/pcal/patches/patch-ag17
-rw-r--r--time/pcal/patches/patch-ah13
-rw-r--r--time/pcal/patches/patch-ai13
5 files changed, 62 insertions, 11 deletions
diff --git a/time/pcal/distinfo b/time/pcal/distinfo
index 96e96451448..2e72eb29467 100644
--- a/time/pcal/distinfo
+++ b/time/pcal/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/03/20 21:34:17 salo Exp $
+$NetBSD: distinfo,v 1.6 2010/04/29 00:17:14 dholland Exp $
SHA1 (pcal-4.7.tar.bz2) = 4604067da16b7674630eb4d8894406b885e85d89
RMD160 (pcal-4.7.tar.bz2) = d0b5380da2bbf94c5c5824f3355b583abba593bc
@@ -8,5 +8,7 @@ SHA1 (patch-ab) = 95205a855ed29f45f68bdb940f88d33133348b97
SHA1 (patch-ac) = ab1eee4e3441268255d4bbc2d043db74d3eac2ae
SHA1 (patch-ad) = ffd8b00dbb716df55be4a7e17f4637dad86bcd1f
SHA1 (patch-ae) = 34ae04ae56d096b1b2294114428dc1f29af83701
-SHA1 (patch-af) = 59f064df3fa9441c22be91c1e6dd12c7ffef3a08
-SHA1 (patch-ag) = 34c442b33d47f51e4f6e82f966446a717ceb64a1
+SHA1 (patch-af) = 1d97ed88bbcadc1187b8a010c6a2856222584bc3
+SHA1 (patch-ag) = e52a268b8301459dcecea70927a0c8862e68435e
+SHA1 (patch-ah) = c8a1ccf6c8f5addd7c4088caae4c8d7fd7f54ef3
+SHA1 (patch-ai) = 86458a1eeffea3722cdbe3d65558c267a7220583
diff --git a/time/pcal/patches/patch-af b/time/pcal/patches/patch-af
index 1669ad8830e..5adf4cf5b33 100644
--- a/time/pcal/patches/patch-af
+++ b/time/pcal/patches/patch-af
@@ -1,8 +1,22 @@
-$NetBSD: patch-af,v 1.1 2005/03/20 21:34:17 salo Exp $
+$NetBSD: patch-af,v 1.2 2010/04/29 00:17:14 dholland Exp $
---- pcalutil.c.orig 2000-02-09 17:06:23.000000000 +0100
-+++ pcalutil.c 2005-03-20 22:26:14.000000000 +0100
-@@ -1111,6 +1111,8 @@
+--- pcalutil.c.orig 2000-02-09 16:06:23.000000000 +0000
++++ pcalutil.c
+@@ -1063,11 +1063,11 @@ cvt_escape(obuf, ibuf)
+ */
+ int
+ #ifdef PROTOS
+-getline(FILE *fp,
++get_line(FILE *fp,
+ char *buf,
+ int *pline)
+ #else
+-getline(fp, buf, pline)
++get_line(fp, buf, pline)
+ FILE *fp;
+ char *buf;
+ int *pline;
+@@ -1111,6 +1111,8 @@ getline(fp, buf, pline)
else
ungetc(c2, fp);
}
diff --git a/time/pcal/patches/patch-ag b/time/pcal/patches/patch-ag
index 6a7d343a4b1..daac4d14c19 100644
--- a/time/pcal/patches/patch-ag
+++ b/time/pcal/patches/patch-ag
@@ -1,8 +1,17 @@
-$NetBSD: patch-ag,v 1.1 2005/03/20 21:34:17 salo Exp $
+$NetBSD: patch-ag,v 1.2 2010/04/29 00:17:14 dholland Exp $
---- readfile.c.orig 2000-02-09 17:06:23.000000000 +0100
-+++ readfile.c 2005-03-20 22:18:17.000000000 +0100
-@@ -1300,8 +1300,9 @@
+--- readfile.c.orig 2000-02-09 16:06:23.000000000 +0000
++++ readfile.c
+@@ -235,7 +235,7 @@ read_datefile(fp, filename)
+
+ /* read lines until EOF */
+
+- while (getline(fp, lbuf, &line)) {
++ while (get_line(fp, lbuf, &line)) {
+ char suffix;
+
+ if (DEBUG(DEBUG_PP)) {
+@@ -1300,8 +1300,9 @@ get_holiday(cp)
{
KWD_H *p;
char tmp[STRSIZ];
diff --git a/time/pcal/patches/patch-ah b/time/pcal/patches/patch-ah
new file mode 100644
index 00000000000..8ec787096c7
--- /dev/null
+++ b/time/pcal/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2010/04/29 00:17:14 dholland Exp $
+
+--- moonphas.c~ 2000-02-09 16:06:23.000000000 +0000
++++ moonphas.c
+@@ -526,7 +526,7 @@ read_moonfile(year)
+ line = 0;
+ mf_date_style = date_style; /* unless overridden by "opt -[AE]" */
+
+- for (nrec = 1; getline(fp, lbuf, &line); nrec++) {
++ for (nrec = 1; get_line(fp, lbuf, &line); nrec++) {
+
+ /* special check for "opt -[AE]" line */
+ n = loadwords(words, lbuf);
diff --git a/time/pcal/patches/patch-ai b/time/pcal/patches/patch-ai
new file mode 100644
index 00000000000..095f52a518e
--- /dev/null
+++ b/time/pcal/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2010/04/29 00:17:14 dholland Exp $
+
+--- protos.h~ 2000-02-09 16:06:23.000000000 +0000
++++ protos.h
+@@ -106,7 +106,7 @@ void define_font PROTO((char *orig_font,
+ void define_shading PROTO((char *orig_shading, char *new_shading,
+ char *dflt_shading));
+ char *find_executable PROTO((char *prog));
+-int getline PROTO((FILE *fp, char *buf, int *pline));
++int get_line PROTO((FILE *fp, char *buf, int *pline));
+ int is_valid PROTO((register int m, register int d, register int y));
+ int loadwords PROTO((char **words, char *buf));
+ char *mk_filespec PROTO((char *filespec, char *path, char *name));