--- sunclock-3.46/sunclock.c Wed Jul 4 14:27:14 2001 +++ sunclock-3.46-patched/sunclock.c Wed May 29 15:51:25 2002 @@ -2320,7 +2320,7 @@ char s[128]; char slat[20], slon[20], slatp[20], slonp[20]; double dist; -#ifdef NEW_CTIME +#if 0 struct timeb tp; if (ftime(&tp) == -1) { --- sunclock-3.46/tildepath.c Fri Sep 1 08:34:51 2000 +++ sunclock-3.46-patched/tildepath.c Wed May 29 15:18:41 2002 @@ -38,7 +38,9 @@ #include #include #include +#ifndef NO_MALLOC_H #include +#endif #include /* --- sunclock-3.53/Makefile.noimake.orig 2004-10-31 12:26:51.000000000 -0800 +++ sunclock-3.53/Makefile.noimake 2005-04-22 20:50:30.000000000 -0700 @@ -34,8 +34,12 @@ #LFLAGS=-L/usr/lib/X11 -lXpm -ljpeg -lsocket # For Linux -CFLAGS=-I/usr/include/X11 -O -Wall -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -LFLAGS= -L/usr/X11R6/lib -lXpm -ljpeg -lpng -lz -lX11 -lm +#CFLAGS=-I/usr/include/X11 -O -Wall -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" +#LFLAGS= -L/usr/X11R6/lib -lXpm -ljpeg -lpng -lz -lX11 -lm + +# For Darwin +CFLAGS = -I/usr/X11R6/include -O -Wall -DNEW_CTIME -DNO_MALLOC_H -DSHAREDIR=\"$(SHAREDIR)\" $(EXTRA_CFLAGS) +LFLAGS =-L/usr/X11R6/lib -lXpm -ljpeg -lpng -lX11 $(EXTRA_LDFLAGS) OFILES=sunclock.o astro.o widgets.o tildepath.o dirlist.o \ readgif.o readjpeg.o readpng.o readvmf.o readxpm.o @@ -64,7 +68,7 @@ cat WARNING install.man: - cp -f sunclock.man $(DESTDIR)$(MANDIR)/sunclock.1x + cp -f sunclock.man $(DESTDIR)$(MANDIR)/sunclock.man if [ -r $(DESTDIR)$(MANDIR)/sunclock.1x.gz ] ; \ then gzip -f $(DESTDIR)$(MANDIR)/sunclock.1x ; fi --- sunclock-3.53/sunclock.h.orig 2005-04-25 18:42:44.000000000 -0700 +++ sunclock-3.53/sunclock.h 2005-04-25 18:44:11.000000000 -0700 @@ -18,7 +18,7 @@ #include #include "version.h" -#define HELPCOMMAND "x-terminal-emulator -e man sunclock &" +#define HELPCOMMAND "xterm -e man sunclock &" #define FAILFONT "fixed" /* num of bitmaps to accomodate 1 mark and 2 spatial objets (Sun, Moon) */