diff options
-rw-r--r-- | www/analog/Makefile | 20 | ||||
-rw-r--r-- | www/analog/distinfo | 8 | ||||
-rw-r--r-- | www/analog/patches/patch-aa | 47 | ||||
-rw-r--r-- | www/analog/pkg/PLIST | 108 |
4 files changed, 80 insertions, 103 deletions
diff --git a/www/analog/Makefile b/www/analog/Makefile index ee9c7771c71..8a7d2ccec06 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.23 2001/02/25 04:18:22 hubertf Exp $ -# FreeBSD Id: Makefile,v 1.15 1999/03/15 02:01:27 steve Exp +# $NetBSD: Makefile,v 1.24 2001/05/14 12:42:14 tron Exp $ -DISTNAME= analog-4.16 +DISTNAME= analog-5.0 CATEGORIES= www MASTER_SITES= ${HOMEPAGE} \ http://www.web42.com/analog/ \ @@ -14,18 +13,21 @@ COMMENT= Extremely fast program for analysing WWW logfiles ALL_TARGET= analog MAKE_ENV+= PREFIX=${PREFIX} +WRKDISTDIR= ${WRKDIR}/${DISTNAME} +WRKSRC= ${WRKDISTDIR}/src do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/analog \ ${PREFIX}/lib/analog/lang \ ${PREFIX}/lib/analog/images - ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog - ${INSTALL_DATA} ${WRKSRC}/images/* ${PREFIX}/lib/analog/images - ${INSTALL_DATA} ${WRKSRC}/lang/* ${PREFIX}/lib/analog/lang - ${INSTALL_PROGRAM} ${WRKSRC}/analog ${PREFIX}/bin - ${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg \ + ${INSTALL_DATA} ${WRKDISTDIR}/docs/* ${PREFIX}/share/doc/analog + ${INSTALL_DATA} ${WRKDISTDIR}/images/* ${PREFIX}/lib/analog/images + ${INSTALL_DATA} ${WRKDISTDIR}/lang/* ${PREFIX}/lib/analog/lang + ${INSTALL_PROGRAM} ${WRKDISTDIR}/analog ${PREFIX}/bin + ${INSTALL_DATA} -m 644 ${WRKDISTDIR}/analog.cfg \ ${PREFIX}/etc/analog.cfg.default ${TEST} -f ${PREFIX}/etc/analog.cfg || \ - ${INSTALL_DATA} -m 644 ${WRKSRC}/analog.cfg ${PREFIX}/etc/analog.cfg + ${INSTALL_DATA} -m 644 ${WRKDISTDIR}/analog.cfg \ + ${PREFIX}/etc/analog.cfg .include "../../mk/bsd.pkg.mk" diff --git a/www/analog/distinfo b/www/analog/distinfo index 603c1742944..7d38b06399c 100644 --- a/www/analog/distinfo +++ b/www/analog/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:02:30 skrll Exp $ +$NetBSD: distinfo,v 1.3 2001/05/14 12:42:14 tron Exp $ -SHA1 (analog-4.16.tar.gz) = d52ca1214665a8c01843e68b04c49d0e2615b9c9 -Size (analog-4.16.tar.gz) = 589785 bytes -SHA1 (patch-aa) = 06c4ca7fd17daff10618c4cedde7d6cbb7349740 +SHA1 (analog-5.0.tar.gz) = 37bda631d5cd03ca942a31a0b80e57de7462d9dd +Size (analog-5.0.tar.gz) = 876695 bytes +SHA1 (patch-aa) = 00b39e621408ad893074770430f0c972f206c120 SHA1 (patch-ab) = f11c9d3f5dec5b9cd04de0d114752c58484a648a diff --git a/www/analog/patches/patch-aa b/www/analog/patches/patch-aa index dd80040b17d..b888655ca9f 100644 --- a/www/analog/patches/patch-aa +++ b/www/analog/patches/patch-aa @@ -1,44 +1,15 @@ -$NetBSD: patch-aa,v 1.14 2001/02/13 19:36:27 tron Exp $ +$NetBSD: patch-aa,v 1.15 2001/05/14 12:42:14 tron Exp $ ---- Makefile.orig Wed Oct 11 14:11:07 2000 -+++ Makefile Fri Oct 27 05:14:48 2000 +--- Makefile.orig Tue May 1 12:38:33 2001 ++++ Makefile Mon May 14 14:23:34 2001 @@ -1,8 +1,8 @@ - # Makefile for analog 4.16 + # 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... -@@ -26,15 +26,26 @@ - # SVR4 requires LIBS = -lsocket -lnsl - # DYNIX/ptx requires LIBS = -L/usr/lib/bsd-socket -lsocket -lnsl - -+OPSYS!= uname -s -+ -+.if ${OPSYS} == "SunOS" -+LIBS+= -lsocket -lnsl -+.endif -+ -+DEFS = -DANALOGDIR=\"${PREFIX}/lib/analog/\" \ -+ -DLOGFILE=\"/var/log/httpd-access.log\" \ -+ -DIMAGEDIR=\"/images/\" \ -+ -DDEFAULTCONFIGFILE=\"${PREFIX}/etc/analog.cfg\" -+ - PROGRAM = analog - OBJS = alias.o analog.o cache.o dates.o globals.o hash.o init.o init2.o \ - 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) -+ $(CC) $(OBJS) -o $(PROGRAM) $(LIBS) - @echo '***' - @echo '***IMPORTANT: You must read the licence before using analog' - @echo '***' +-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 diff --git a/www/analog/pkg/PLIST b/www/analog/pkg/PLIST index 5e18764c690..c17dce4a536 100644 --- a/www/analog/pkg/PLIST +++ b/www/analog/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2001/01/24 10:02:40 tron Exp $ +@comment $NetBSD: PLIST,v 1.17 2001/05/14 12:42:14 tron Exp $ bin/analog etc/analog.cfg.default @exec test -f %D/etc/analog.cfg || cp -p %F %D/etc/analog.cfg @@ -52,26 +52,36 @@ lib/analog/images/barh32.gif lib/analog/images/barh4.gif lib/analog/images/barh8.gif lib/analog/images/html2.gif +lib/analog/images/sq0.png +lib/analog/images/sq1.png +lib/analog/images/sq2.png +lib/analog/images/sq3.png +lib/analog/images/sq4.png +lib/analog/images/sq5.png +lib/analog/images/sq6.png +lib/analog/images/sq7.png +lib/analog/images/sq8.png +lib/analog/images/sq9.png +lib/analog/images/sqg.png lib/analog/lang/README.txt -lib/analog/lang/bradom.tab -lib/analog/lang/brdom.tab -lib/analog/lang/brhdom.tab -lib/analog/lang/cn.lng -lib/analog/lang/ptadom.tab -lib/analog/lang/ptdom.tab -lib/analog/lang/pthdom.tab -lib/analog/lang/tw.lng -lib/analog/lang/twdom.tab -lib/analog/lang/usdom.tab lib/analog/lang/am.lng lib/analog/lang/amdom.tab lib/analog/lang/ba.lng +lib/analog/lang/bg.lng +lib/analog/lang/bgdesc.txt +lib/analog/lang/bgdom.tab +lib/analog/lang/bgmik.lng +lib/analog/lang/bgmikdom.tab +lib/analog/lang/bgmkdesc.txt lib/analog/lang/br.lng lib/analog/lang/bra.lng -lib/analog/lang/brh.lng +lib/analog/lang/bradom.tab +lib/analog/lang/brdom.tab lib/analog/lang/cat.lng lib/analog/lang/cata.lng -lib/analog/lang/cath.lng +lib/analog/lang/catadom.tab +lib/analog/lang/catdom.tab +lib/analog/lang/cn.lng lib/analog/lang/cz.lng lib/analog/lang/cz1250.lng lib/analog/lang/cza.lng @@ -80,30 +90,25 @@ lib/analog/lang/dea.lng lib/analog/lang/deadom.tab lib/analog/lang/dedom.tab lib/analog/lang/deform.html -lib/analog/lang/deh.lng -lib/analog/lang/dehdom.tab lib/analog/lang/dk.lng lib/analog/lang/dka.lng -lib/analog/lang/dkh.lng lib/analog/lang/es.lng lib/analog/lang/esa.lng lib/analog/lang/esadom.tab lib/analog/lang/esdom.tab lib/analog/lang/esform.html -lib/analog/lang/esh.lng -lib/analog/lang/eshdom.tab lib/analog/lang/fi.lng lib/analog/lang/fia.lng -lib/analog/lang/fih.lng +lib/analog/lang/fiadom.tab +lib/analog/lang/fidom.tab lib/analog/lang/fr.lng lib/analog/lang/fra.lng lib/analog/lang/fradom.tab lib/analog/lang/frdom.tab lib/analog/lang/frform.html -lib/analog/lang/frh.lng -lib/analog/lang/frhdom.tab lib/analog/lang/gr.lng lib/analog/lang/gra.lng +lib/analog/lang/hr.lng lib/analog/lang/hu.cfg lib/analog/lang/hu.lng lib/analog/lang/hua.lng @@ -111,35 +116,38 @@ lib/analog/lang/huadom.tab lib/analog/lang/hudom.tab lib/analog/lang/is.lng lib/analog/lang/isa.lng -lib/analog/lang/ish.lng lib/analog/lang/it.lng lib/analog/lang/ita.lng lib/analog/lang/itadom.tab lib/analog/lang/itdom.tab lib/analog/lang/itform.html -lib/analog/lang/ith.lng -lib/analog/lang/ithdom.tab +lib/analog/lang/jp.cfg lib/analog/lang/jp.lng +lib/analog/lang/jpdesc.txt +lib/analog/lang/jpdom.tab lib/analog/lang/jpform.html lib/analog/lang/kr.lng lib/analog/lang/lt.lng lib/analog/lang/lv.lng -lib/analog/lang/lva.lng lib/analog/lang/nl.lng -lib/analog/lang/nla.lng +lib/analog/lang/nladesc.txt +lib/analog/lang/nladom.tab +lib/analog/lang/nldesc.txt +lib/analog/lang/nldom.tab lib/analog/lang/no.lng lib/analog/lang/no2.lng lib/analog/lang/no2a.lng -lib/analog/lang/no2h.lng lib/analog/lang/noa.lng -lib/analog/lang/noh.lng lib/analog/lang/pl.lng lib/analog/lang/pla.lng lib/analog/lang/pladom.tab lib/analog/lang/pldom.tab lib/analog/lang/pt.lng lib/analog/lang/pta.lng -lib/analog/lang/pth.lng +lib/analog/lang/ptadesc.txt +lib/analog/lang/ptadom.tab +lib/analog/lang/ptdesc.txt +lib/analog/lang/ptdom.tab lib/analog/lang/ro.lng lib/analog/lang/rodom.tab lib/analog/lang/ru.lng @@ -149,47 +157,41 @@ lib/analog/lang/se.lng lib/analog/lang/sea.lng lib/analog/lang/seadom.tab lib/analog/lang/sealt.lng -lib/analog/lang/sealta.lng -lib/analog/lang/sealth.lng +lib/analog/lang/sealtdesc.txt lib/analog/lang/sedom.tab -lib/analog/lang/seh.lng -lib/analog/lang/sehdom.tab lib/analog/lang/si.lng lib/analog/lang/si1250.lng lib/analog/lang/sk.lng lib/analog/lang/ska.lng lib/analog/lang/tr.lng lib/analog/lang/tra.lng +lib/analog/lang/tw.lng +lib/analog/lang/twdom.tab lib/analog/lang/ua.lng +lib/analog/lang/uadesc.txt lib/analog/lang/uk.lng -lib/analog/lang/uka.lng +lib/analog/lang/uk12.lng +lib/analog/lang/ukdesc.txt lib/analog/lang/ukdom.tab lib/analog/lang/us.lng -lib/analog/lang/usa.lng +lib/analog/lang/us24.lng +lib/analog/lang/usdesc.txt +lib/analog/lang/usdom.tab lib/analog/lang/usform.html lib/analog/lang/yu.lng lib/analog/lang/yua.lng lib/analog/lang/yudom.tab -lib/analog/lang/bg.lng -lib/analog/lang/bgdom.tab -lib/analog/lang/bgh.lng -lib/analog/lang/bghdom.tab -lib/analog/lang/catadom.tab -lib/analog/lang/catdom.tab -lib/analog/lang/cathdom.tab -lib/analog/lang/fiadom.tab -lib/analog/lang/fidom.tab -lib/analog/lang/fihdom.tab -lib/analog/lang/hr.lng -share/doc/analog/analogo.gif -share/doc/analog/anlgdocs.css -share/doc/analog/favicon.ico share/doc/analog/Licence.txt +share/doc/analog/Licgd.txt +share/doc/analog/Licpcre.txt +share/doc/analog/Licpng.txt +share/doc/analog/Liczlib.txt share/doc/analog/Readme.html share/doc/analog/acknow.html share/doc/analog/alias.html +share/doc/analog/analogo.gif +share/doc/analog/anlgdocs.css share/doc/analog/args.html -share/doc/analog/basiccmd.html share/doc/analog/bara8.gif share/doc/analog/barb1.gif share/doc/analog/barb32.gif @@ -200,6 +202,7 @@ 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 share/doc/analog/custom.html @@ -209,6 +212,7 @@ share/doc/analog/dns.html share/doc/analog/domfile.html share/doc/analog/errors.html share/doc/analog/faq.html +share/doc/analog/favicon.ico share/doc/analog/form.html share/doc/analog/helpers.html share/doc/analog/hierreps.html @@ -234,10 +238,10 @@ share/doc/analog/update.html share/doc/analog/wasnew1.html share/doc/analog/wasnew2.html share/doc/analog/wasnew3.html +share/doc/analog/wasnew4.html share/doc/analog/webworks.html share/doc/analog/whatsnew.html -share/doc/analog/whole.html +@dirrm share/doc/analog @dirrm lib/analog/lang @dirrm lib/analog/images @dirrm lib/analog -@dirrm share/doc/analog |