diff options
author | Andrey A. Chernov <ache@FreeBSD.org> | 1999-09-09 21:29:46 +0000 |
---|---|---|
committer | Andrey A. Chernov <ache@FreeBSD.org> | 1999-09-09 21:29:46 +0000 |
commit | 1ec9ccf931de9272425dc381022da3a31ede7200 (patch) | |
tree | 0a167f5bf3d3b6410032ed075c2a055d2170c6bb /www | |
parent | Fix package building problem. (diff) |
upgrade to 3.32
Notes
Notes:
svn path=/head/; revision=21519
Diffstat (limited to 'www')
-rw-r--r-- | www/analog/Makefile | 4 | ||||
-rw-r--r-- | www/analog/distinfo | 2 | ||||
-rw-r--r-- | www/analog/files/patch-aa | 15 | ||||
-rw-r--r-- | www/analog/files/patch-ab | 74 | ||||
-rw-r--r-- | www/analog/pkg-plist | 73 |
5 files changed, 78 insertions, 90 deletions
diff --git a/www/analog/Makefile b/www/analog/Makefile index 7dffbe42b3e5..a0d1e4fc887a 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -7,8 +7,8 @@ # $FreeBSD$ # -DISTNAME= analog3.3 -PKGNAME= analog-3.3 +DISTNAME= analog3.32 +PKGNAME= analog-3.32 CATEGORIES= www MASTER_SITES= http://www.statslab.cam.ac.uk/~sret1/analog/ \ http://brendanr.simplenet.com/analog/ \ diff --git a/www/analog/distinfo b/www/analog/distinfo index a94f40003de0..836761973e0b 100644 --- a/www/analog/distinfo +++ b/www/analog/distinfo @@ -1 +1 @@ -MD5 (analog3.3.tar.gz) = ff1ed8d18c6e41d4edcc8a7fb517bfff +MD5 (analog3.32.tar.gz) = d3e53dd67409dcaccb4cf92d2f458c1a diff --git a/www/analog/files/patch-aa b/www/analog/files/patch-aa index cdc9817ebd60..241af7985c45 100644 --- a/www/analog/files/patch-aa +++ b/www/analog/files/patch-aa @@ -1,7 +1,7 @@ ---- Makefile.orig Wed May 19 04:07:25 1999 -+++ Makefile Thu Jun 3 13:35:15 1999 -@@ -1,11 +1,12 @@ - # Makefile for analog 3.3 +--- Makefile.orig Wed Sep 1 17:24:44 1999 ++++ Makefile Fri Sep 10 01:02:27 1999 +@@ -1,11 +1,15 @@ + # Makefile for analog 3.32 # 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 @@ -12,11 +12,14 @@ # -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 = -DPREFIX=\"$(PREFIX)\" ++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 # Solaris 2 (SunOS 5) might need DEFS = -DNEED_STRCMP -@@ -25,11 +26,13 @@ +@@ -25,11 +29,13 @@ 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 diff --git a/www/analog/files/patch-ab b/www/analog/files/patch-ab deleted file mode 100644 index 5597d0e17fc8..000000000000 --- a/www/analog/files/patch-ab +++ /dev/null @@ -1,74 +0,0 @@ -*** analhead.h.orig Thu Apr 9 14:59:28 1998 ---- analhead.h Fri Apr 10 01:34:18 1998 -*************** -*** 5,10 **** ---- 5,13 ---- - - #ifndef ANALHEAD - #define ANALHEAD -+ #ifndef PREFIX -+ #define PREFIX "/usr/local" -+ #endif - - /*** The first few options -- up to LOGO -- are ones that you may want to - change before compiling the program for the first time. However, all of -*************** -*** 18,25 **** - /* the URL of your host's home page, for linking to at the top of the - output; use "none" for no linking. */ - -! #define HTTPDIR "/usr/local/etc/httpd/" -! #define ANALOGDIR HTTPDIR"analog/" - /* The directories where your HTTP stuff lives and where your analog stuff - lives. You don't really need these; they are just used in this file to - build up other filenames. Note how you can stick together names by ---- 21,27 ---- - /* the URL of your host's home page, for linking to at the top of the - output; use "none" for no linking. */ - -! #define ANALOGDIR PREFIX"/lib/analog/" - /* The directories where your HTTP stuff lives and where your analog stuff - lives. You don't really need these; they are just used in this file to - build up other filenames. Note how you can stick together names by -*************** -*** 29,39 **** - #define DOMAINSFILE ANALOGDIR"domains.tab" - /* the file where the domain definitions live; see docs/domfile.html */ - -! #define LOGFILE HTTPDIR"logs/access_log" - /* The name of the default logfile. Can be a list, separated by commas - (but no spaces), and can include wild cards. */ - -! #define IMAGEDIR "images/" - /* URL of the directory where the images for the graphical reports live. - The URL can be absolute, or relative to the output page: e.g., just the - empty string "" for the same directory as the output page. */ ---- 31,41 ---- - #define DOMAINSFILE ANALOGDIR"domains.tab" - /* the file where the domain definitions live; see docs/domfile.html */ - -! #define LOGFILE "/var/log/httpd-access.log" - /* The name of the default logfile. Can be a list, separated by commas - (but no spaces), and can include wild cards. */ - -! #define IMAGEDIR "/images/" - /* URL of the directory where the images for the graphical reports live. - The URL can be absolute, or relative to the output page: e.g., just the - empty string "" for the same directory as the output page. */ -*************** -*** 41,47 **** - #define LANGDIR ANALOGDIR"lang/" - /* Directory where the language files live. */ - -! #define DEFAULTCONFIGFILE ANALOGDIR"analog.cfg" - /* the name of the default configuration file; see README.html for a - description of this file. Use "none" for no configuration file. */ - ---- 43,49 ---- - #define LANGDIR ANALOGDIR"lang/" - /* Directory where the language files live. */ - -! #define DEFAULTCONFIGFILE PREFIX"/etc/analog.cfg" - /* the name of the default configuration file; see README.html for a - description of this file. Use "none" for no configuration file. */ - diff --git a/www/analog/pkg-plist b/www/analog/pkg-plist index 73e3a10a4b90..a4f82322e15c 100644 --- a/www/analog/pkg-plist +++ b/www/analog/pkg-plist @@ -1,5 +1,6 @@ bin/analog -etc/analog.cfg +etc/analog.cfg-dist +@exec if [ ! -f %D/etc/analog.cfg ] ; then cp -p %D/%F %B/analog.cfg; fi lib/analog/lang/bra.lng lib/analog/lang/brh.lng lib/analog/lang/cata.lng @@ -33,7 +34,9 @@ lib/analog/lang/is.lng lib/analog/lang/isa.lng lib/analog/lang/ish.lng lib/analog/lang/ita.lng +lib/analog/lang/itadom.tab lib/analog/lang/ith.lng +lib/analog/lang/ithdom.tab lib/analog/lang/jp.lng lib/analog/lang/jpform.html lib/analog/lang/kr.lng @@ -54,6 +57,7 @@ lib/analog/lang/pth.lng lib/analog/lang/ro.lng lib/analog/lang/rua.lng lib/analog/lang/ruh.lng +lib/analog/lang/ruhdom.tab lib/analog/lang/sea.lng lib/analog/lang/seh.lng lib/analog/lang/si1250.lng @@ -66,10 +70,21 @@ lib/analog/lang/trh.lng lib/analog/lang/uk.lng lib/analog/lang/ukdom.tab lib/analog/lang/us.lng +lib/analog/lang/yu.lng share/doc/analog/Licence.txt share/doc/analog/Readme.html share/doc/analog/acknow.html share/doc/analog/alias.html +share/doc/analog/bara8.gif +share/doc/analog/barb1.gif +share/doc/analog/barb32.gif +share/doc/analog/barb8.gif +share/doc/analog/barc8.gif +share/doc/analog/bard8.gif +share/doc/analog/bare8.gif +share/doc/analog/barf8.gif +share/doc/analog/barg8.gif +share/doc/analog/barh8.gif share/doc/analog/basiccmd.html share/doc/analog/cache.html share/doc/analog/compout.html @@ -93,6 +108,8 @@ share/doc/analog/map.html share/doc/analog/meaning.html share/doc/analog/othreps.html share/doc/analog/output.html +share/doc/analog/quickref.html +share/doc/analog/reports.html share/doc/analog/start.html share/doc/analog/startmac.html share/doc/analog/startos2.html @@ -107,12 +124,54 @@ share/doc/analog/webworks.html share/doc/analog/whatsnew.html share/doc/analog/whole.html www/data/images/analogo.gif -www/data/images/bar1.gif -www/data/images/bar16.gif -www/data/images/bar2.gif -www/data/images/bar32.gif -www/data/images/bar4.gif -www/data/images/bar8.gif +www/data/images/bara1.gif +www/data/images/bara16.gif +www/data/images/bara2.gif +www/data/images/bara32.gif +www/data/images/bara4.gif +www/data/images/bara8.gif +www/data/images/barb1.gif +www/data/images/barb16.gif +www/data/images/barb2.gif +www/data/images/barb32.gif +www/data/images/barb4.gif +www/data/images/barb8.gif +www/data/images/barc1.gif +www/data/images/barc16.gif +www/data/images/barc2.gif +www/data/images/barc32.gif +www/data/images/barc4.gif +www/data/images/barc8.gif +www/data/images/bard1.gif +www/data/images/bard16.gif +www/data/images/bard2.gif +www/data/images/bard32.gif +www/data/images/bard4.gif +www/data/images/bard8.gif +www/data/images/bare1.gif +www/data/images/bare16.gif +www/data/images/bare2.gif +www/data/images/bare32.gif +www/data/images/bare4.gif +www/data/images/bare8.gif +www/data/images/barf1.gif +www/data/images/barf16.gif +www/data/images/barf2.gif +www/data/images/barf32.gif +www/data/images/barf4.gif +www/data/images/barf8.gif +www/data/images/barg1.gif +www/data/images/barg16.gif +www/data/images/barg2.gif +www/data/images/barg32.gif +www/data/images/barg4.gif +www/data/images/barg8.gif +www/data/images/barh1.gif +www/data/images/barh16.gif +www/data/images/barh2.gif +www/data/images/barh32.gif +www/data/images/barh4.gif +www/data/images/barh8.gif www/data/images/html2.gif @dirrm lib/analog/lang @dirrm lib/analog |