diff options
Diffstat (limited to 'www/analog/files')
-rw-r--r-- | www/analog/files/patch-aa | 61 | ||||
-rw-r--r-- | www/analog/files/patch-ab | 6 | ||||
-rw-r--r-- | www/analog/files/patch-ac | 14 |
3 files changed, 33 insertions, 48 deletions
diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa index 34f3b8af5543..fa7eb10c8505 100644 --- a/www/analog/files/patch-aa +++ b/www/analog/files/patch-aa @@ -1,45 +1,30 @@ ---- Makefile.orig Tue Feb 13 07:09:08 2001 -+++ Makefile Wed Apr 11 17:28:09 2001 -@@ -1,13 +1,13 @@ - # Makefile for analog 4.16 +--- src/Makefile.orig Thu May 3 19:22:47 2001 ++++ src/Makefile Thu May 3 19:23:59 2001 +@@ -1,12 +1,12 @@ + # Makefile for analog 5.0 # Please read docs/Readme.html, or http://www.analog.cx/ -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; - # NeXTSTEP apparently needs... - # CEXTRAFLAGS = -O2 -pipe -no-precomp --DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ... -+#DEFS = # any of -DNOPIPES -DNODNS -DNODIRENT -DNOOPEN ... - # ... -DEBCDIC -DNOGMTIME -DNEED_STRCMP -DNEED_MEMMOVE ... - # ... -DNEED_STRTOUL -DNEED_DIFFTIME -DHAVE_ADDR_T ... - # ... -DNEED_FLOATINGPOINT_H -@@ -18,6 +18,10 @@ - # DYNIX/ptx reportedly needs -D_SOCKET_VERSION=11 - # MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE - # All the options are explained at the bottom of this file. -+DEFS = -DANALOGDIR=\"$(PREFIX)/share/analog/\" \ +-CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. ++#CFLAGS = -O2 # options, e.g. for optimisation or ANSI compilation. + # HP/UX cc needs CFLAGS = -Aa (HP/UX 9) or -Ae (HP/UX 10) + # BS2000/OSD needs CFLAGS = -XLLML -XLLMK + # NeXTSTEP needs CFLAGS = -O2 -pipe -no-precomp +-DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ... ++#DEFS = # any combination of -DNOPIPES -DNODNS -DNODIRENT -DNOGLOB ... + # ... -DNOOPEN -DNOFOLLOW -DNOALARM -DNOGRAPHICS -DNOGMTIME ... + # ... -DEBCDIC -DUSE_PLAIN_SETJMP -DHAVE_GD -DHAVE_PCRE ... + # ... -DNEED_STRCMP -DNEED_MEMMOVE -DNEED_STRTOUL ... +@@ -19,6 +19,11 @@ + # 64-bit Solaris needs -DHAVE_ADDR_T + # DYNIX/ptx needs -D_SOCKET_VERSION=11 + # MPE/iX needs -D_POSIX_SOURCE -D_SOCKET_SOURCE ++DEFS = -DANALOGDIR=\"$(PREFIX)/share/analog/\" \ + -DLOGFILE=\"/var/log/httpd-access.log\" \ + -DIMAGEDIR=\"/images/\" \ + -DDEFAULTCONFIGFILE=\"$(PREFIX)/etc/analog.cfg\" - OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS, - # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400 - LIBS = # extra libraries needed; Solaris 2 (SunOS 5) needs -@@ -33,12 +37,12 @@ - input.o macinput.o macstuff.o output.o output2.o pcre.o process.o \ - settings.o sort.o tree.o utils.o win32.o - HEADERS = anlghead.h anlghea2.h anlghea3.h anlghea4.h macdir.h pcre.h --CFLAGS = $(CEXTRAFLAGS) $(DEFS) -D$(OS) -+CFLAGS += $(DEFS) -D$(OS) - - $(PROGRAM): $(OBJS) $(HEADERS) Makefile - $(CC) $(CEXTRAFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) - @echo '***' -- @echo '***IMPORTANT: You must read the licence before using analog' -+ @echo '***IMPORTANT: You must read the license before using analog' - @echo '***' - - # There doesn't seem to be a good way to write all these rules in a generic ++ + # + OS = UNIX # Operating system: UNIX, DOS, WIN32, MAC, OS2, OSX, VMS + # RISCOS, BEOS, NEXTSTEP, MPEIX, BS2000, AS400, OS390 diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab index db1b2da82ba2..10cae850af90 100644 --- a/www/analog/files/patch-ab +++ b/www/analog/files/patch-ab @@ -1,6 +1,6 @@ ---- tree.c.orig Fri Dec 17 13:15:19 1999 -+++ tree.c Thu Dec 23 11:19:15 1999 -@@ -781,8 +781,16 @@ +--- src/tree.c.orig Thu May 3 19:31:50 2001 ++++ src/tree.c Thu May 3 19:32:22 2001 +@@ -803,8 +803,16 @@ } else if (strstr(whole, "Linux") != NULL || strstr(whole, "linux") != NULL) *name = "Unix:Linux"; diff --git a/www/analog/files/patch-ac b/www/analog/files/patch-ac index 81a7605e0e7e..16656ea0e87d 100644 --- a/www/analog/files/patch-ac +++ b/www/analog/files/patch-ac @@ -1,12 +1,12 @@ ---- analog.cfg.orig Tue Mar 21 12:58:01 2000 -+++ analog.cfg Thu Mar 23 12:27:27 2000 -@@ -7,7 +7,8 @@ +--- analog.cfg.orig Thu May 3 19:27:47 2001 ++++ analog.cfg Thu May 3 19:27:15 2001 +@@ -9,7 +9,8 @@ # There is a much more extensive configuration file in examples/big.cfg # - # If you need 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 commands. +-LOGFILE logfile.log +LOGFORMAT COMBINED +LOGFILE /var/log/httpd-access.log - # OUTFILE outfile.html + # LOGFILE /old/logs/access_log.* + # OUTFILE Report.html # HOSTNAME "[my organisation]" - # REQINCLUDE pages |