diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1999-12-09 04:18:18 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1999-12-09 04:18:18 +0000 |
commit | fa456ae2aca2e320d5ef9cc651a903851d7986df (patch) | |
tree | a86ebf6ab6f5d24b932279ec42c18751a3c5bda9 /www/analog/files | |
parent | Tabify and fix manpath. (diff) |
Upgrade to 4.0
Notes
Notes:
svn path=/head/; revision=23664
Diffstat (limited to 'www/analog/files')
-rw-r--r-- | www/analog/files/patch-aa | 28 | ||||
-rw-r--r-- | www/analog/files/patch-ac | 16 |
2 files changed, 19 insertions, 25 deletions
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa index 241af7985c45..88c825d62027 100644 --- a/www/analog/files/patch-aa +++ b/www/analog/files/patch-aa @@ -1,36 +1,30 @@ ---- Makefile.orig Wed Sep 1 17:24:44 1999 -+++ Makefile Fri Sep 10 01:02:27 1999 +--- Makefile.orig Sun Nov 14 17:17:21 1999 ++++ Makefile Thu Dec 9 06:48:56 1999 @@ -1,11 +1,15 @@ - # Makefile for analog 3.32 + # Makefile for analog 4.0 # Please read docs/Readme.html, or http://www.statslab.cam.ac.uk/~sret1/analog/ -CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different -+CC ?= gcc # which compiler to use: eg cc, acc, gcc. NB Different ++#CC = gcc # which compiler to use: eg cc, acc, gcc. NB Different # compilers need different CFLAGS, e.g., -O instead of -O2. -CEXTRAFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. +#CEXTRAFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. # HP/UX cc requires CEXTRAFLAGS = -Aa (HP/UX 9) or ... # -Ae (HP/UX 10); BS2000/OSD requires -XLLML -XLLMK --DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DEBCDIC ... -+#DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DEBCDIC ... +-DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ... ++#DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN -DNOREGEX ... +DEFS = -DANALOGDIR=\"$(PREFIX)/lib/analog/\" \ + -DLOGFILE=\"/var/log/httpd-access.log\" \ + -DIMAGEDIR=\"/images/\" \ + -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" - # ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ... - # ... -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H + # ... -DEBCDIC -DNEED_STRCMP -DNEED_MEMMOVE ... + # ... -DNEED_STRTOUL -DNEED_DIFFTIME -DNEED_FLOATINGPOINT_H # Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP -@@ -25,11 +29,13 @@ - macinput.o macstuff.o output.o output2.o process.o settings.o \ +@@ -25,7 +29,7 @@ + input.o macinput.o macstuff.o output.o output2.o process.o settings.o \ sort.o tree.o utils.o win32.o - HEADERS = analhead.h analhea2.h macdir.h + HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h -CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS) +CFLAGS += $(CEXTRAFLAGS) $(DEFS) -D$(OS) - # Form interface options: - FORMPROG = anlgform.cgi # The program that processes the data from the form - FORMSRC = anlgform.c # The source code for that program -+ -+all: $(PROGRAM) - $(PROGRAM): $(OBJS) $(HEADERS) Makefile $(CC) $(CEXTRAFLAGS) $(OBJS) -o $(PROGRAM) $(LIBS) diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac index 80f6e25f4015..198f56c837c8 100644 --- a/www/analog/files/patch-ac +++ b/www/analog/files/patch-ac @@ -1,12 +1,12 @@ ---- analog.cfg.orig Wed Nov 25 22:49:33 1998 -+++ analog.cfg Tue Jan 19 21:24:09 1999 -@@ -8,7 +8,8 @@ - # REQINCLUDE pages +--- analog.cfg.orig Tue Nov 16 14:40:33 1999 ++++ analog.cfg Thu Dec 9 06:53:56 1999 +@@ -7,7 +7,8 @@ + # There is a much more extensive configuration file in examples/big.cfg # - # If you have a LOGFORMAT command it must go here, above the LOGFILE command. --LOGFILE logfile.log + # If you need a LOGFORMAT command it must go here, above the LOGFILE command. +-# LOGFILE logfile.log +LOGFORMAT COMBINED +LOGFILE /var/log/httpd-access.log - HOSTNAME "[my organisation]" + # HOSTNAME "[my organisation]" + # REQINCLUDE pages LINKINCLUDE pages - UNCOMPRESS *.gz,*.Z "gzip -cd" |