Tue Aug 28 17:14:13 2012 UTC ()
phoon 29jun2005. Mostly an update to astronomy routines derived from
J. Walker's Moontool 2.5 (used to be 2.0).
(is)
diff -r1.1 -r1.2 pkgsrc/time/phoon/DESCR
diff -r1.11 -r1.12 pkgsrc/time/phoon/Makefile
diff -r1.5 -r1.6 pkgsrc/time/phoon/distinfo
diff -r1.3 -r1.4 pkgsrc/time/phoon/patches/patch-aa
diff -r0 -r1.1 pkgsrc/time/phoon/patches/patch-ab
diff -r0 -r1.1 pkgsrc/time/phoon/patches/patch-ac
--- pkgsrc/time/phoon/DESCR 2001/11/10 19:53:45 1.1
+++ pkgsrc/time/phoon/DESCR 2012/08/28 17:14:13 1.2
| @@ -1,12 +1,10 @@ | | | @@ -1,12 +1,10 @@ |
1 | phoon - display current moon phase on ASCII terminal | | 1 | phoon - display current moon phase |
2 | Distribution of 01apr95 | | | |
3 | Previous distribution 07jun88 | | | |
4 | | | 2 | |
5 | phoon - program to display the PHase of the mOON. Unlike other | | 3 | phoon - program to display the PHase of the mOON. Unlike other |
6 | such programs, which just tell you how long since first quarter | | 4 | such programs, which just tell you how long since first quarter |
7 | or something like that, phoon *shows* you the phase with a little | | 5 | or something like that, phoon *shows* you the phase with a little |
8 | picture. I've put an example at the end of this file. I first | | 6 | picture. I've put an example at the end of this file. I first |
9 | wrote this program in Pascal / TOPS-20 at CMU in 1979; I translated | | 7 | wrote this program in Pascal / TOPS-20 at CMU in 1979; I translated |
10 | it to Ratfor / Software Tools in 1981; and now it's in C / Unix. | | 8 | it to Ratfor / Software Tools in 1981; and now it's in C / Unix. |
11 | | | 9 | |
12 | Jef Poskanzer jef@acme.com http://www.acme.com/jef/ | | 10 | Jef Poskanzer jef@mail.acme.com http://www.acme.com/jef/ |
--- pkgsrc/time/phoon/Makefile 2008/06/12 02:14:53 1.11
+++ pkgsrc/time/phoon/Makefile 2012/08/28 17:14:13 1.12
| @@ -1,18 +1,18 @@ | | | @@ -1,18 +1,18 @@ |
1 | # $NetBSD: Makefile,v 1.11 2008/06/12 02:14:53 joerg Exp $ | | 1 | # $NetBSD: Makefile,v 1.12 2012/08/28 17:14:13 is Exp $ |
2 | # | | 2 | # |
3 | | | 3 | |
4 | DISTNAME= phoon_01apr1995 | | 4 | DISTNAME= phoon_29jun2005 |
5 | PKGNAME= phoon-19950401 | | 5 | PKGNAME= phoon-20050629 |
6 | CATEGORIES= time | | 6 | CATEGORIES= time |
7 | MASTER_SITES= http://www.acme.com/software/phoon/ | | 7 | MASTER_SITES= http://www.acme.com/software/phoon/ |
8 | | | 8 | |
9 | MAINTAINER= is@NetBSD.org | | 9 | MAINTAINER= is@NetBSD.org |
10 | HOMEPAGE= http://www.acme.com/software/phoon/ | | 10 | HOMEPAGE= http://www.acme.com/software/phoon/ |
11 | COMMENT= Show phase of the moon on ASCII terminal | | 11 | COMMENT= Show phase of the moon on ASCII terminal |
12 | | | 12 | |
13 | PKG_DESTDIR_SUPPORT= user-destdir | | 13 | PKG_DESTDIR_SUPPORT= user-destdir |
14 | | | 14 | |
15 | WRKSRC= ${WRKDIR}/phoon | | 15 | WRKSRC= ${WRKDIR}/phoon |
16 | | | 16 | |
17 | .include "../../mk/bsd.prefs.mk" | | 17 | .include "../../mk/bsd.prefs.mk" |
18 | | | 18 | |
--- pkgsrc/time/phoon/distinfo 2012/05/10 22:16:54 1.5
+++ pkgsrc/time/phoon/distinfo 2012/08/28 17:14:13 1.6
| @@ -1,6 +1,8 @@ | | | @@ -1,6 +1,8 @@ |
1 | $NetBSD: distinfo,v 1.5 2012/05/10 22:16:54 dholland Exp $ | | 1 | $NetBSD: distinfo,v 1.6 2012/08/28 17:14:13 is Exp $ |
2 | | | 2 | |
3 | SHA1 (phoon_01apr1995.tar.gz) = b0e81c9cd6f1d332bc25340c12e1f0fcc274c8b5 | | 3 | SHA1 (phoon_29jun2005.tar.gz) = d646af184b83e1a4104fe82588daadae2938e08c |
4 | RMD160 (phoon_01apr1995.tar.gz) = e5521bc9a78b34070f5072a112bf99d59f3ed7ac | | 4 | RMD160 (phoon_29jun2005.tar.gz) = 5a03f83965e8b6dd490a6fffd0ec6bf36d155853 |
5 | Size (phoon_01apr1995.tar.gz) = 15769 bytes | | 5 | Size (phoon_29jun2005.tar.gz) = 17450 bytes |
6 | SHA1 (patch-aa) = 3c51027cf81895628774dd59dd002b62668b8560 | | 6 | SHA1 (patch-aa) = 96167efc32d02cbd4b17f096438d03b034d6ac78 |
| | | 7 | SHA1 (patch-ab) = 2a2aa975027dad5392a69c1238c2805417484c32 |
| | | 8 | SHA1 (patch-ac) = 5fe9ed29dfdcfa61405eb1d9baab6f20f640dd93 |
--- pkgsrc/time/phoon/patches/patch-aa 2012/05/10 22:16:55 1.3
+++ pkgsrc/time/phoon/patches/patch-aa 2012/08/28 17:14:13 1.4
| @@ -1,38 +1,38 @@ | | | @@ -1,38 +1,38 @@ |
1 | $NetBSD: patch-aa,v 1.3 2012/05/10 22:16:55 dholland Exp $ | | 1 | $NetBSD: patch-aa,v 1.4 2012/08/28 17:14:13 is Exp $ |
2 | diff -r -u phoon.orig/Makefile Makefile | | 2 | |
3 | --- phoon.orig/Makefile Sat Nov 11 20:57:08 1995 | | 3 | --- Makefile.orig 2003-01-21 03:04:36.000000000 +0000 |
4 | +++ Makefile Sat Nov 10 20:10:33 2001 | | 4 | +++ Makefile |
5 | @@ -1,15 +1,15 @@ | | 5 | @@ -1,15 +1,14 @@ |
6 | # Makefile for phoon | | 6 | # Makefile for phoon |
7 | | | 7 | |
8 | -BINDIR = /usr/local/bin | | 8 | -BINDIR = /usr/local/bin |
9 | -MANDIR = /usr/local/man/man1 | | 9 | -MANDIR = /usr/local/man/man1 |
10 | +BINDIR = ${PREFIX}/bin | | 10 | +BINDIR = ${PREFIX}/bin |
11 | +MANDIR = ${PREFIX}/${PKGMANDIR}/man1 | | 11 | +MANDIR = ${PREFIX}/${PKGMANDIR}/man1 |
12 | + | | 12 | + |
13 | +INSTALL = install | | 13 | +INSTALL = install |
14 | | | 14 | |
15 | DEFINES = -DBSD | | 15 | DEFINES = -DOS_BSD |
16 | #DEFINES = -DSYSV | | 16 | #DEFINES = -DOS_SYSV |
17 | | | 17 | |
18 | -CC = gcc | | 18 | -CC = gcc |
19 | -CFLAGS = -O $(DEFINES) | | 19 | -CFLAGS = -O $(DEFINES) |
20 | +CFLAGS += $(DEFINES) | | 20 | - |
21 | | | | |
22 | -LDFLAGS = -s | | 21 | -LDFLAGS = -s |
| | | 22 | +CFLAGS = $(DEFINES) |
23 | | | 23 | |
24 | | | 24 | |
25 | all: phoon | | 25 | all: phoon |
26 | @@ -21,10 +21,8 @@ | | 26 | @@ -24,10 +23,8 @@ date_parse.o: date_parse.h |
27 | $(CC) $(CFLAGS) -c $< | | 27 | astro.o: astro.h |
28 | | | 28 | |
29 | install: all | | 29 | install: all |
30 | - rm -f $(BINDIR)/phoon | | 30 | - rm -f $(BINDIR)/phoon |
31 | - cp phoon $(BINDIR) | | 31 | - cp phoon $(BINDIR) |
32 | - rm -f $(MANDIR)/phoon.1 | | 32 | - rm -f $(MANDIR)/phoon.1 |
33 | - cp phoon.1 $(MANDIR) | | 33 | - cp phoon.1 $(MANDIR) |
34 | + ${BSD_INSTALL_PROGRAM} phoon ${DESTDIR}$(BINDIR) | | 34 | + ${BSD_INSTALL_PROGRAM} phoon ${DESTDIR}$(BINDIR) |
35 | + ${BSD_INSTALL_MAN} phoon.1 ${DESTDIR}$(MANDIR) | | 35 | + ${BSD_INSTALL_MAN} phoon.1 ${DESTDIR}$(MANDIR) |
36 | | | 36 | |
37 | clean: | | 37 | clean: |
38 | rm -f phoon *.o a.out core | | 38 | rm -f phoon *.o a.out core |
$NetBSD: patch-ab,v 1.1 2012/08/28 17:14:13 is Exp $
--- astro.c.orig 2003-01-28 00:56:55.000000000 +0000
+++ astro.c
@@ -25,6 +25,7 @@
** See http://www.fourmilab.ch/moontool/
*/
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <time.h>
$NetBSD: patch-ac,v 1.1 2012/08/28 17:14:13 is Exp $
--- phoon.c.orig 2005-05-20 19:10:24.000000000 +0000
+++ phoon.c
@@ -45,6 +45,7 @@
*/
+#include <stdlib.h>
#include <stdio.h>
#include <math.h>
#include <time.h>
@@ -354,7 +355,7 @@ putmoon( time_t t, int numlines, char* a
struct tm* tmP;
double jd, pctphase, angphase, cphase, aom, cdist, cangdia, csund, csuang;
double phases[2], which[2];
- long clocknow;
+ time_t clocknow;
int atflrlen, atflridx, numcols, lin, col, midlin;
double mcap, yrad, xrad, y, xright, xleft;
int colright, colleft;