From owner-svn-src-user@FreeBSD.ORG  Thu Mar  4 06:55:10 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD0F51065672;
	Thu,  4 Mar 2010 06:55:10 +0000 (UTC)
	(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACDDD8FC15;
	Thu,  4 Mar 2010 06:55:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o246tArR097646;
	Thu, 4 Mar 2010 06:55:10 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o246tAUI097643;
	Thu, 4 Mar 2010 06:55:10 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201003040655.o246tAUI097643@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 4 Mar 2010 06:55:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204696 - user/edwin/ncal
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Mar 2010 06:55:10 -0000

Author: edwin
Date: Thu Mar  4 06:55:10 2010
New Revision: 204696
URL: http://svn.freebsd.org/changeset/base/204696

Log:
  Remove my chanes to the Makefile, not needed anymore.
  Cleanup prototypes.

Modified:
  user/edwin/ncal/Makefile
  user/edwin/ncal/ncal.c

Modified: user/edwin/ncal/Makefile
==============================================================================
--- user/edwin/ncal/Makefile	Thu Mar  4 06:43:41 2010	(r204695)
+++ user/edwin/ncal/Makefile	Thu Mar  4 06:55:10 2010	(r204696)
@@ -4,10 +4,9 @@ PROG=	ncal
 
 DPADD=	${LIBCALENDAR} ${LIBTERMCAP}
 LDADD=	-lcalendar -ltermcap
-CFLAGS+= -Wall -O0
 WARNS?=	6
 
-#LINKS=	${BINDIR}/ncal ${BINDIR}/cal
+LINKS=	${BINDIR}/ncal ${BINDIR}/cal
 MLINKS=	ncal.1 cal.1
 
 .include <bsd.prog.mk>

Modified: user/edwin/ncal/ncal.c
==============================================================================
--- user/edwin/ncal/ncal.c	Thu Mar  4 06:43:41 2010	(r204695)
+++ user/edwin/ncal/ncal.c	Thu Mar  4 06:55:10 2010	(r204696)
@@ -168,16 +168,16 @@ int	today;
 char	*center(char *s, char *t, int w);
 wchar_t *wcenter(wchar_t *s, wchar_t *t, int w);
 void	mkmonthr(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
-void    mkweekdays(struct weekdays * wds);
-int     parsemonth(const char *s, int *m, int *y);
-void    printcc(void);
-void    printeaster(int year, int julian, int orthodox);
+void	mkmonthb(int year, int month, int jd_flag, struct monthlines * monthl);
+void	mkweekdays(struct weekdays * wds);
+int	parsemonth(const char *s, int *m, int *y);
+void	printcc(void);
+void	printeaster(int year, int julian, int orthodox);
 int	firstday(int y, int m);
 date	*sdater(int ndays, struct date * d);
 date	*sdateb(int ndays, struct date * d);
-int     sndaysr(struct date * d);
-int     sndaysb(struct date * d);
+int	sndaysr(struct date * d);
+int	sndaysb(struct date * d);
 static void	usage(void);
 void	monthranger(int year, int jd_flag, int m, int before, int after);
 void	monthrangeb(int year, int jd_flag, int m, int before, int after);