diff options
Diffstat (limited to 'misc/birthday/files/patch-Makefile')
| -rw-r--r-- | misc/birthday/files/patch-Makefile | 62 |
1 files changed, 23 insertions, 39 deletions
diff --git a/misc/birthday/files/patch-Makefile b/misc/birthday/files/patch-Makefile index 749125497af5..93013d80f796 100644 --- a/misc/birthday/files/patch-Makefile +++ b/misc/birthday/files/patch-Makefile @@ -1,11 +1,10 @@ ---- Makefile-- Sat Jan 16 18:08:59 1999 -+++ Makefile Thu May 24 21:49:08 2001 -@@ -1,24 +1,27 @@ +--- Makefile Sat Jan 16 18:08:59 1999 ++++ Makefile Thu Apr 4 19:21:49 2002 +@@ -1,24 +1,39 @@ -# overall makefile for birthday, to get around the differing syntax of Borland and GNU makes. +###################################################################### +# birthday. Reminder of birthdays and other events in the near future. -+# CVS/RCS string removed -+# Edited by Niek Bergboer <niek@bergboer.net> for FreeBSD ports ++# $Id: Makefile.in,v 1.3 2000/01/02 19:17:33 andy Exp $ -# version for GNU make -Makefile.gnu: makemake Makefile.in @@ -31,51 +30,36 @@ - tar --exclude=RCS/* --dereference -czf ../birthday.tgz * +all: birthday + ++# NB note the different syntax for if ++ ++# UNIX is replaced by name of OS by makemake +OS=UNIX -+OSCFLAGS=-Wall -Wstrict-prototypes -+CFLAGS+=-D$(OS) $(OSCFLAGS) + ++# can override this on the commandline if req'd ++DEBUG= ++OSCFLAGS=-Wall -Wstrict-prototypes ++CFLAGS+=-O2 $(DEBUG) -D$(OS) $(OSCFLAGS) +# engine +ENGSRC=bdengine.c xmalloc.c -+CMDSRC=birthday.c bdcal.c $(ENGSRC) ++ ++# OS-specific sources ++OSSRC= ++ ++CMDSRC=birthday.c bdcal.c $(ENGSRC) $(OSSRC) + +CMDOBJ=$(CMDSRC:.c=.o) + +birthday: $(CMDOBJ) + $(CC) $(LDFLAGS) $(CMDOBJ) -o $@ + ++# you can override this to use the new FHS locations. ++SHARE= ++#SHARE=/share ++ +install: birthday birthday.man -+ # Installation of dirs bin and man/man1 removed -+ install -c -s birthday $(PREFIX)/bin/birthday -+ install -c -m 0644 birthday.man $(PREFIX)/man/man1/birthday.1 ++ # Installation of dirs bin and man/man1 removed ++ install -s birthday $(PREFIX)/bin/birthday ++ install -m 0644 birthday.man $(PREFIX)/man/man1/birthday.1 + +clean: + rm -f birthday *.o ---- bdengine.c-- Thu May 10 20:03:34 2001 -+++ bdengine.c Thu May 24 21:43:51 2001 -@@ -186,9 +186,10 @@ - if (n > 0) { \ - ptr+=sprintf(ptr, "%d " txt "%s", n, (n == 1 ? "" : "s")); \ - terms--; \ -- if (orgterms > 1) \ -- if (terms == 1) ptr += sprintf(ptr, " and "); \ -- else if (terms > 1) ptr += sprintf(ptr, ", "); \ -+ if (orgterms > 1) { \ -+ if (terms == 1) { ptr += sprintf(ptr, " and "); } \ -+ else { if (terms > 1) ptr += sprintf(ptr, ", "); } \ -+ } \ - } - #endif /* NUMS_AS_WORDS */ - ---- getopt.h-- Fri Aug 9 11:53:20 1996 -+++ getopt.h Thu May 24 21:43:51 2001 -@@ -100,7 +100,8 @@ - errors, only prototype getopt for the GNU C library. */ - extern int getopt (int argc, char *const *argv, const char *shortopts); - #else /* not __GNU_LIBRARY__ */ --extern int getopt (); -+/* But FreeBSD STDC does have the GNU syntax */ -+extern int getopt (int argc, char *const *argv, const char *shortopts); - #endif /* not __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); |