Update to 20jan2003: date parsing functions rewritten.

From: Nick Nauwelaerts <nick@nauwelaerts.net>
This commit is contained in:
naddy 2004-03-02 23:15:30 +00:00
parent 03f7c4ed17
commit 62f1f8d394
4 changed files with 26 additions and 42 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.1.1.1 2003/01/13 23:34:18 naddy Exp $
# $OpenBSD: Makefile,v 1.2 2004/03/02 23:15:30 naddy Exp $
COMMENT= "displays the phase of the moon in ascii"
DISTNAME= phoon-20020326
DISTNAME= phoon-20030120
CATEGORIES= astro
HOMEPAGE= http://www.acme.com/software/phoon/
@ -16,11 +16,12 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${HOMEPAGE}
DISTFILES= phoon_26mar2002.tar.gz
DISTFILES= phoon_20jan2003.tar.gz
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -DBSD" LDFLAGS=""
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -DOS_BSD" LDFLAGS=""
WRKDIST= ${WRKDIR}/phoon
NO_REGRESS= Yes
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/phoon ${PREFIX}/bin

View File

@ -1,3 +1,3 @@
MD5 (phoon_26mar2002.tar.gz) = e54d8643da6b08412db2a0f3ca9e46e0
RMD160 (phoon_26mar2002.tar.gz) = 376992faac3b4cf010851b69c85feee3f5e71dbb
SHA1 (phoon_26mar2002.tar.gz) = 382d09e9cd1fcf555ef4e4b6de7afe452d8ac30b
MD5 (phoon_20jan2003.tar.gz) = 843ee16af4b50c53688f24c24169425b
RMD160 (phoon_20jan2003.tar.gz) = 1e755e5a43994be781caabf31bb6f2664a0f6a88
SHA1 (phoon_20jan2003.tar.gz) = c08f850c30ea209e6311b477b52f9550f36f505b

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-date_parse_c,v 1.1 2004/03/02 23:15:30 naddy Exp $
--- date_parse.c.orig 2004-02-23 19:12:53.000000000 +0100
+++ date_parse.c 2004-02-23 19:13:02.000000000 +0100
@@ -47,6 +47,7 @@
#include <sys/types.h>
#include <stdio.h>
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
#include <time.h>

View File

@ -1,40 +1,12 @@
$OpenBSD: patch-phoon_c,v 1.1.1.1 2003/01/13 23:34:18 naddy Exp $
--- phoon.c.orig Sat Nov 11 21:14:36 1995
+++ phoon.c Mon Jan 13 20:53:12 2003
@@ -46,6 +46,7 @@
#include <stdio.h>
+#include <string.h>
#include <math.h>
#include <time.h>
@@ -360,10 +361,10 @@ putmoon( t, numlines, atfiller )
$OpenBSD: patch-phoon_c,v 1.2 2004/03/02 23:15:30 naddy Exp $
--- phoon.c.orig 2004-02-23 18:45:07.000000000 +0100
+++ phoon.c 2004-02-23 18:45:26.000000000 +0100
@@ -354,7 +354,7 @@ putmoon( time_t t, int numlines, char* a
struct tm* tmP;
double jd, angphase, cphase, aom, cdist, cangdia, csund, csuang;
double jd, pctphase, angphase, cphase, aom, cdist, cangdia, csund, csuang;
double phases[2], which[2];
- long secphase, clocknow;
- long clocknow;
+ time_t clocknow;
int atflrlen, atflridx, numcols, lin, col, midlin;
double mcap, yrad, xrad, y, xright, xleft;
- int colright, colleft, i;
+ int colright, colleft;
char c;
/* This is just for Halloween. */
@@ -499,13 +500,13 @@ putmoon( t, numlines, atfiller )
/* Main program. */
-main( argc, argv )
+int main( argc, argv )
int argc;
char* argv[];
{
time_t t;
char buf[100];
- int numlines, argi, i;
+ int numlines, argi;
char* usage = "usage: %s [-l <lines>] [<date/time>]\n";
/* Parge args. */
int colright, colleft;