From d1ef53dcb3a0bddcd0f27f0385ad62875667a98b Mon Sep 17 00:00:00 2001
From: wcobb <wcobb@openbsd.org>
Date: Fri, 2 Aug 2002 01:43:47 +0000
Subject: [PATCH] - don't use bundled printf functions. - add missing
 prototypes. ok naddy@

---
 astro/luna/patches/patch-famplan_c | 11 ++++++++++
 astro/luna/patches/patch-luna_h    | 34 +++++++++++++++++++++++++-----
 astro/luna/patches/patch-makefile  | 10 ++++-----
 3 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 astro/luna/patches/patch-famplan_c

diff --git a/astro/luna/patches/patch-famplan_c b/astro/luna/patches/patch-famplan_c
new file mode 100644
index 00000000000..a0bf8981e5b
--- /dev/null
+++ b/astro/luna/patches/patch-famplan_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-famplan_c,v 1.1 2002/08/02 01:43:47 wcobb Exp $
+--- famplan.c.orig	Thu Aug  1 20:37:45 2002
++++ famplan.c	Thu Aug  1 20:38:42 2002
+@@ -216,7 +216,6 @@ bufgetymd(chp, abvalue)
+ {
+ 	int		yy, mm, dd;
+ 	static ABDATE	newestdate  = (ABDATE)0;
+-	static ABDATE	newestvdate = (ABDATE)0;
+ 
+ 	*chp = bufskipbr(*chp);
+ 	if (**chp == '*') {
diff --git a/astro/luna/patches/patch-luna_h b/astro/luna/patches/patch-luna_h
index d989d240eba..acf0f2027d5 100644
--- a/astro/luna/patches/patch-luna_h
+++ b/astro/luna/patches/patch-luna_h
@@ -1,16 +1,40 @@
-$OpenBSD: patch-luna_h,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
---- luna.h.orig	Fri Nov  9 11:44:17 2001
-+++ luna.h	Fri Nov  9 11:44:51 2001
-@@ -32,7 +32,7 @@ typedef enum {
+$OpenBSD: patch-luna_h,v 1.2 2002/08/02 01:43:47 wcobb Exp $
+--- luna.h.orig	Thu Aug  1 20:35:34 2002
++++ luna.h	Thu Aug  1 20:42:19 2002
+@@ -11,6 +11,7 @@
  
  
+ #include	<stdio.h>
++#include	<stdlib.h>
+ #include	<ctype.h>
+ #include	<string.h>
+ #include	<time.h>
+@@ -19,20 +20,18 @@
+ # include	<dos.h>
+ #endif	/* MSDOS */
+ #include	"pyramid.h"
+-#include	"iprintf/iprint.h"
+ 
+ typedef enum {
+ 	FALSE,
+ 	TRUE
+ }	BOOLEAN;
+ 
+-#define	printf	iprintf
+-#define	sprintf	isprintf
+-#define	fprintf	ifprintf
+-
++extern int		getext(int, int, int);
++extern int		getmoon(int, int);
++extern int		ymd2yday(int, int, int);
+ 
  #if defined(ANSI)
 -	extern void		main(int argc, char **argv);
 +	extern int		main(int argc, char **argv);
  	extern void		drawluna(int aotmoon);
  	extern void		usage(void);
  	extern void		getoptions(int argc, char **argv,
-@@ -40,7 +40,7 @@ typedef enum {
+@@ -40,7 +39,7 @@ typedef enum {
  	extern int		getext(int year, int mon, int day);
  	extern void		printextstate(int age);
  #else
diff --git a/astro/luna/patches/patch-makefile b/astro/luna/patches/patch-makefile
index da706a2b183..07de9b9a0d4 100644
--- a/astro/luna/patches/patch-makefile
+++ b/astro/luna/patches/patch-makefile
@@ -1,6 +1,6 @@
-$OpenBSD: patch-makefile,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
---- makefile.orig	Fri Nov  9 11:55:55 2001
-+++ makefile	Fri Nov  9 11:56:34 2001
+$OpenBSD: patch-makefile,v 1.2 2002/08/02 01:43:47 wcobb Exp $
+--- makefile.orig	Thu Aug  1 20:35:34 2002
++++ makefile	Thu Aug  1 20:42:45 2002
 @@ -2,23 +2,14 @@
  # 	Makefile for luna using BSD cc
  # 
@@ -56,8 +56,8 @@ $OpenBSD: patch-makefile,v 1.1.1.1 2002/04/27 15:23:58 wcobb Exp $
  # UNIX
 -#$(PROG) : $(OBJS) $(OBJSIP)
 -#	$(LD) -o $(PROG) $(OBJS) $(OBJSIP) $(LDFLAGS) 
-+$(PROG) : $(OBJS) $(OBJSIP)
-+	$(LD) -o $(PROG) $(OBJS) $(OBJSIP) $(LDFLAGS) 
++$(PROG) : $(OBJS)
++	$(LD) -o $(PROG) $(OBJS) $(LDFLAGS) 
  
  $(OBJS) : $(HDRS)