update to analog-6.0.17

This commit is contained in:
sthen 2022-03-21 12:29:14 +00:00
parent fa3444d5b1
commit 9980989f20
10 changed files with 120 additions and 149 deletions

View File

@ -1,18 +1,18 @@
COMMENT= extremely fast program for analysing WWW logfiles
DISTNAME= analog-6.0
REVISION= 5
GH_ACCOUNT= c-amie
GH_PROJECT= analog-ce
GH_TAGNAME= 6.0.17
DISTNAME= analog-${GH_TAGNAME}
CATEGORIES= www
HOMEPAGE= https://analog.gsp.com/
MASTER_SITES= https://analog.gsp.com/ \
https://redmoon.reverse.net/analog/
HOMEPAGE= https://www.c-amie.co.uk/software/analog/
# GPLv2 only
PERMIT_PACKAGE= Yes
WANTLIB += c iconv m jpeg png z gd>=18 pcre pthread
WANTLIB += c iconv m jpeg png z gd pcre
LIB_DEPENDS= converters/libiconv \
graphics/gd \
@ -37,17 +37,11 @@ ALL_TARGET= analog
MAKE_FLAGS= CC='${CC}' CFLAGS='${CFLAGS}' \
LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lgd -lpng -lm -ljpeg -lz -lpcre -liconv"
pre-configure:
@mv ${WRKSRC}/anlgform.pl ${WRKSRC}/anlgform.pl.src
@sed -e "s,@PREFIX@,${PREFIX},g" < ${WRKSRC}/anlgform.pl.src \
> ${WRKSRC}/anlgform.pl
NO_TEST= Yes
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/analog
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/analog
${INSTALL_DATA_DIR} ${ANALOGDIR}/lang ${ANALOGDIR}/images
${INSTALL_DATA_DIR} ${PREFIX}/share/{doc,examples}/analog \
${ANALOGDIR}/lang ${ANALOGDIR}/images
${INSTALL_PROGRAM} ${WRKBUILD}/analog ${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/analog
${INSTALL_DATA} ${WRKSRC}/examples/*.cfg \
@ -56,5 +50,6 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/lang/* ${ANALOGDIR}/lang
cd ${WRKSRC} && ${INSTALL_DATA} anlgform.html anlgform.pl \
${ANALOGDIR}
${INSTALL_MAN} ${WRKSRC}/analog.man ${PREFIX}/man/man1/analog.1
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (analog-6.0.tar.gz) = McDivt0JaPnUZX2yM7IEJ9jEl76YGU2vGdb4Wdf2/Mo=
SIZE (analog-6.0.tar.gz) = 1553316
SHA256 (analog-6.0.17.tar.gz) = DleUwuqlgm3AFJFuQT6Q6ycUpkb/jW7AJkNxgteJsRc=
SIZE (analog-6.0.17.tar.gz) = 1593749

View File

@ -1,11 +1,12 @@
--- anlgform.pl.orig Sun Dec 19 06:51:22 2004
+++ anlgform.pl Wed May 30 16:26:18 2007
Index: anlgform.pl
--- anlgform.pl.orig
+++ anlgform.pl
@@ -52,6 +52,8 @@ $lt = localtime;
$progname = $0 || 'anlgform.pl';
if (($^O =~ /win32/i || $^O =~ /^win/i) && Win32::GetShortPathName($analog)) {
$analog = Win32::GetShortPathName($analog);
+} else {
+ $analog = "@PREFIX@/bin/analog";
+ $analog = "/usr/local/bin/analog";
}
# coerce query keys to caps in a new (key, pointer to array) hash called args

View File

@ -1,5 +1,6 @@
--- examples/big.cfg.orig Sun Dec 19 06:51:23 2004
+++ examples/big.cfg Wed May 30 16:25:24 2007
Index: examples/big.cfg
--- examples/big.cfg.orig
+++ examples/big.cfg
@@ -19,7 +19,7 @@
# it must go here, above the LOGFILE commands.
# LOGFORMAT MICROSOFT-NA

View File

@ -1,5 +1,6 @@
--- src/alias.c.orig Fri Dec 5 07:09:11 2014
+++ src/alias.c Fri Dec 5 07:11:04 2014
Index: src/alias.c
--- src/alias.c.orig
+++ src/alias.c
@@ -158,7 +158,7 @@ logical do_aliasr(char *name, char *dirsuffix, unsign
if (dirsufflength > 0 && dirsufflength < (unsigned int)(e2 - name) &&
*(e2 - dirsufflength - 1) == '/' &&

View File

@ -1,5 +1,6 @@
--- src/init2.c.orig Sun Dec 19 06:51:30 2004
+++ src/init2.c Wed May 30 16:25:24 2007
Index: src/init2.c
--- src/init2.c.orig
+++ src/init2.c
@@ -226,10 +226,10 @@ void configchoice(void *opt, char *cmd, char *arg1, ch
return;
}

View File

@ -1,5 +1,6 @@
--- src/init.c.orig Sun Dec 19 06:51:30 2004
+++ src/init.c Wed May 30 16:25:24 2007
Index: src/init.c
--- src/init.c.orig
+++ src/init.c
@@ -1458,7 +1458,6 @@ choice strtoinfmt(Inputformat **ans, char *s, choice *
c++;
if (*c == 'S')

View File

@ -1,14 +0,0 @@
--- src/tree.c.orig Sun Dec 19 06:51:31 2004
+++ src/tree.c Wed May 30 16:28:41 2007
@@ -871,7 +871,10 @@ void Pnextname(char **name, char **nameend, char *whol
else
*name = "Windows:Unknown Windows";
}
- else if (*c >= '6' && *c <= '9')
+ else if (*c == '6') {
+ *name = "Windows:Windows Vista";
+ }
+ else if (*c >= '7' && *c <= '9')
*name = "Windows:Unknown Windows";
else
*name = "Windows:Windows NT";

View File

@ -1,5 +1,6 @@
--- src/utils.c.orig Sun Dec 19 06:51:31 2004
+++ src/utils.c Wed May 30 16:25:24 2007
Index: src/utils.c
--- src/utils.c.orig
+++ src/utils.c
@@ -706,7 +706,7 @@ logical wildmatch(char *s, char *p, char *whole, int n
below. */
ss = strchr(s, '\0');

View File

@ -1,302 +1,286 @@
@conflict chipmunk-*
bin/analog
@bin bin/analog
@man man/man1/analog.1
share/analog/
share/analog/anlgform.html
share/analog/anlgform.pl
@mode 111
@group bin
@sample /var/www/cgi-bin/anlgform.pl
@mode
@group
share/analog/images/
@group bin
@sample /var/www/htdocs/analog-images/
@group
share/analog/images/analog.css
@sample /var/www/htdocs/analog-images/analog.css
share/analog/images/analogo.gif
@group bin
@sample /var/www/htdocs/analog-images/analogo.gif
@group
share/analog/images/analogo.png
@sample /var/www/htdocs/analog-images/analogo.png
share/analog/images/bara1.gif
@group bin
@sample /var/www/htdocs/analog-images/bara1.gif
@group
share/analog/images/bara1.png
@sample /var/www/htdocs/analog-images/bara1.png
share/analog/images/bara16.gif
@group bin
@sample /var/www/htdocs/analog-images/bara16.gif
@group
share/analog/images/bara16.png
@sample /var/www/htdocs/analog-images/bara16.png
share/analog/images/bara2.gif
@group bin
@sample /var/www/htdocs/analog-images/bara2.gif
@group
share/analog/images/bara2.png
@sample /var/www/htdocs/analog-images/bara2.png
share/analog/images/bara32.gif
@group bin
@sample /var/www/htdocs/analog-images/bara32.gif
@group
share/analog/images/bara32.png
@sample /var/www/htdocs/analog-images/bara32.png
share/analog/images/bara4.gif
@group bin
@sample /var/www/htdocs/analog-images/bara4.gif
@group
share/analog/images/bara4.png
@sample /var/www/htdocs/analog-images/bara4.png
share/analog/images/bara8.gif
@group bin
@sample /var/www/htdocs/analog-images/bara8.gif
@group
share/analog/images/bara8.png
@sample /var/www/htdocs/analog-images/bara8.png
share/analog/images/barb1.gif
@group bin
@sample /var/www/htdocs/analog-images/barb1.gif
@group
share/analog/images/barb1.png
@sample /var/www/htdocs/analog-images/barb1.png
share/analog/images/barb16.gif
@group bin
@sample /var/www/htdocs/analog-images/barb16.gif
@group
share/analog/images/barb16.png
@sample /var/www/htdocs/analog-images/barb16.png
share/analog/images/barb2.gif
@group bin
@sample /var/www/htdocs/analog-images/barb2.gif
@group
share/analog/images/barb2.png
@sample /var/www/htdocs/analog-images/barb2.png
share/analog/images/barb32.gif
@group bin
@sample /var/www/htdocs/analog-images/barb32.gif
@group
share/analog/images/barb32.png
@sample /var/www/htdocs/analog-images/barb32.png
share/analog/images/barb4.gif
@group bin
@sample /var/www/htdocs/analog-images/barb4.gif
@group
share/analog/images/barb4.png
@sample /var/www/htdocs/analog-images/barb4.png
share/analog/images/barb8.gif
@group bin
@sample /var/www/htdocs/analog-images/barb8.gif
@group
share/analog/images/barb8.png
@sample /var/www/htdocs/analog-images/barb8.png
share/analog/images/barc1.gif
@group bin
@sample /var/www/htdocs/analog-images/barc1.gif
@group
share/analog/images/barc1.png
@sample /var/www/htdocs/analog-images/barc1.png
share/analog/images/barc16.gif
@group bin
@sample /var/www/htdocs/analog-images/barc16.gif
@group
share/analog/images/barc16.png
@sample /var/www/htdocs/analog-images/barc16.png
share/analog/images/barc2.gif
@group bin
@sample /var/www/htdocs/analog-images/barc2.gif
@group
share/analog/images/barc2.png
@sample /var/www/htdocs/analog-images/barc2.png
share/analog/images/barc32.gif
@group bin
@sample /var/www/htdocs/analog-images/barc32.gif
@group
share/analog/images/barc32.png
@sample /var/www/htdocs/analog-images/barc32.png
share/analog/images/barc4.gif
@group bin
@sample /var/www/htdocs/analog-images/barc4.gif
@group
share/analog/images/barc4.png
@sample /var/www/htdocs/analog-images/barc4.png
share/analog/images/barc8.gif
@group bin
@sample /var/www/htdocs/analog-images/barc8.gif
@group
share/analog/images/barc8.png
@sample /var/www/htdocs/analog-images/barc8.png
share/analog/images/bard1.gif
@group bin
@sample /var/www/htdocs/analog-images/bard1.gif
@group
share/analog/images/bard1.png
@sample /var/www/htdocs/analog-images/bard1.png
share/analog/images/bard16.gif
@group bin
@sample /var/www/htdocs/analog-images/bard16.gif
@group
share/analog/images/bard16.png
@sample /var/www/htdocs/analog-images/bard16.png
share/analog/images/bard2.gif
@group bin
@sample /var/www/htdocs/analog-images/bard2.gif
@group
share/analog/images/bard2.png
@sample /var/www/htdocs/analog-images/bard2.png
share/analog/images/bard32.gif
@group bin
@sample /var/www/htdocs/analog-images/bard32.gif
@group
share/analog/images/bard32.png
@sample /var/www/htdocs/analog-images/bard32.png
share/analog/images/bard4.gif
@group bin
@sample /var/www/htdocs/analog-images/bard4.gif
@group
share/analog/images/bard4.png
@sample /var/www/htdocs/analog-images/bard4.png
share/analog/images/bard8.gif
@group bin
@sample /var/www/htdocs/analog-images/bard8.gif
@group
share/analog/images/bard8.png
@sample /var/www/htdocs/analog-images/bard8.png
share/analog/images/bare1.gif
@group bin
@sample /var/www/htdocs/analog-images/bare1.gif
@group
share/analog/images/bare1.png
@sample /var/www/htdocs/analog-images/bare1.png
share/analog/images/bare16.gif
@group bin
@sample /var/www/htdocs/analog-images/bare16.gif
@group
share/analog/images/bare16.png
@sample /var/www/htdocs/analog-images/bare16.png
share/analog/images/bare2.gif
@group bin
@sample /var/www/htdocs/analog-images/bare2.gif
@group
share/analog/images/bare2.png
@sample /var/www/htdocs/analog-images/bare2.png
share/analog/images/bare32.gif
@group bin
@sample /var/www/htdocs/analog-images/bare32.gif
@group
share/analog/images/bare32.png
@sample /var/www/htdocs/analog-images/bare32.png
share/analog/images/bare4.gif
@group bin
@sample /var/www/htdocs/analog-images/bare4.gif
@group
share/analog/images/bare4.png
@sample /var/www/htdocs/analog-images/bare4.png
share/analog/images/bare8.gif
@group bin
@sample /var/www/htdocs/analog-images/bare8.gif
@group
share/analog/images/bare8.png
@sample /var/www/htdocs/analog-images/bare8.png
share/analog/images/barf1.gif
@group bin
@sample /var/www/htdocs/analog-images/barf1.gif
@group
share/analog/images/barf1.png
@sample /var/www/htdocs/analog-images/barf1.png
share/analog/images/barf16.gif
@group bin
@sample /var/www/htdocs/analog-images/barf16.gif
@group
share/analog/images/barf16.png
@sample /var/www/htdocs/analog-images/barf16.png
share/analog/images/barf2.gif
@group bin
@sample /var/www/htdocs/analog-images/barf2.gif
@group
share/analog/images/barf2.png
@sample /var/www/htdocs/analog-images/barf2.png
share/analog/images/barf32.gif
@group bin
@sample /var/www/htdocs/analog-images/barf32.gif
@group
share/analog/images/barf32.png
@sample /var/www/htdocs/analog-images/barf32.png
share/analog/images/barf4.gif
@group bin
@sample /var/www/htdocs/analog-images/barf4.gif
@group
share/analog/images/barf4.png
@sample /var/www/htdocs/analog-images/barf4.png
share/analog/images/barf8.gif
@group bin
@sample /var/www/htdocs/analog-images/barf8.gif
@group
share/analog/images/barf8.png
@sample /var/www/htdocs/analog-images/barf8.png
share/analog/images/barg1.gif
@group bin
@sample /var/www/htdocs/analog-images/barg1.gif
@group
share/analog/images/barg1.png
@sample /var/www/htdocs/analog-images/barg1.png
share/analog/images/barg16.gif
@group bin
@sample /var/www/htdocs/analog-images/barg16.gif
@group
share/analog/images/barg16.png
@sample /var/www/htdocs/analog-images/barg16.png
share/analog/images/barg2.gif
@group bin
@sample /var/www/htdocs/analog-images/barg2.gif
@group
share/analog/images/barg2.png
@sample /var/www/htdocs/analog-images/barg2.png
share/analog/images/barg32.gif
@group bin
@sample /var/www/htdocs/analog-images/barg32.gif
@group
share/analog/images/barg32.png
@sample /var/www/htdocs/analog-images/barg32.png
share/analog/images/barg4.gif
@group bin
@sample /var/www/htdocs/analog-images/barg4.gif
@group
share/analog/images/barg4.png
@sample /var/www/htdocs/analog-images/barg4.png
share/analog/images/barg8.gif
@group bin
@sample /var/www/htdocs/analog-images/barg8.gif
@group
share/analog/images/barg8.png
@sample /var/www/htdocs/analog-images/barg8.png
share/analog/images/barh1.gif
@group bin
@sample /var/www/htdocs/analog-images/barh1.gif
@group
share/analog/images/barh1.png
@sample /var/www/htdocs/analog-images/barh1.png
share/analog/images/barh16.gif
@group bin
@sample /var/www/htdocs/analog-images/barh16.gif
@group
share/analog/images/barh16.png
@sample /var/www/htdocs/analog-images/barh16.png
share/analog/images/barh2.gif
@group bin
@sample /var/www/htdocs/analog-images/barh2.gif
@group
share/analog/images/barh2.png
@sample /var/www/htdocs/analog-images/barh2.png
share/analog/images/barh32.gif
@group bin
@sample /var/www/htdocs/analog-images/barh32.gif
@group
share/analog/images/barh32.png
@sample /var/www/htdocs/analog-images/barh32.png
share/analog/images/barh4.gif
@group bin
@sample /var/www/htdocs/analog-images/barh4.gif
@group
share/analog/images/barh4.png
@sample /var/www/htdocs/analog-images/barh4.png
share/analog/images/barh8.gif
@group bin
@sample /var/www/htdocs/analog-images/barh8.gif
@group
share/analog/images/barh8.png
@sample /var/www/htdocs/analog-images/barh8.png
share/analog/images/bari1.gif
@sample /var/www/htdocs/analog-images/bari1.gif
share/analog/images/bari1.png
@sample /var/www/htdocs/analog-images/bari1.png
share/analog/images/bari16.gif
@sample /var/www/htdocs/analog-images/bari16.gif
share/analog/images/bari16.png
@sample /var/www/htdocs/analog-images/bari16.png
share/analog/images/bari2.gif
@sample /var/www/htdocs/analog-images/bari2.gif
share/analog/images/bari2.png
@sample /var/www/htdocs/analog-images/bari2.png
share/analog/images/bari32.gif
@sample /var/www/htdocs/analog-images/bari32.gif
share/analog/images/bari32.png
@sample /var/www/htdocs/analog-images/bari32.png
share/analog/images/bari4.gif
@sample /var/www/htdocs/analog-images/bari4.gif
share/analog/images/bari4.png
@sample /var/www/htdocs/analog-images/bari4.png
share/analog/images/bari8.gif
@sample /var/www/htdocs/analog-images/bari8.gif
share/analog/images/bari8.png
@sample /var/www/htdocs/analog-images/bari8.png
share/analog/images/barj1.gif
@sample /var/www/htdocs/analog-images/barj1.gif
share/analog/images/barj1.png
@sample /var/www/htdocs/analog-images/barj1.png
share/analog/images/barj16.gif
@sample /var/www/htdocs/analog-images/barj16.gif
share/analog/images/barj16.png
@sample /var/www/htdocs/analog-images/barj16.png
share/analog/images/barj2.gif
@sample /var/www/htdocs/analog-images/barj2.gif
share/analog/images/barj2.png
@sample /var/www/htdocs/analog-images/barj2.png
share/analog/images/barj32.gif
@sample /var/www/htdocs/analog-images/barj32.gif
share/analog/images/barj32.png
@sample /var/www/htdocs/analog-images/barj32.png
share/analog/images/barj4.gif
@sample /var/www/htdocs/analog-images/barj4.gif
share/analog/images/barj4.png
@sample /var/www/htdocs/analog-images/barj4.png
share/analog/images/barj8.gif
@sample /var/www/htdocs/analog-images/barj8.gif
share/analog/images/barj8.png
@sample /var/www/htdocs/analog-images/barj8.png
share/analog/images/html2.gif
@group bin
@sample /var/www/htdocs/analog-images/html2.gif
@group
share/analog/images/html2.png
@sample /var/www/htdocs/analog-images/html2.png
share/analog/images/sq0.png
@sample /var/www/htdocs/analog-images/sq0.png
share/analog/images/sq1.png
@sample /var/www/htdocs/analog-images/sq1.png
share/analog/images/sq2.png
@sample /var/www/htdocs/analog-images/sq2.png
share/analog/images/sq3.png
@sample /var/www/htdocs/analog-images/sq3.png
share/analog/images/sq4.png
@sample /var/www/htdocs/analog-images/sq4.png
share/analog/images/sq5.png
@sample /var/www/htdocs/analog-images/sq5.png
share/analog/images/sq6.png
@sample /var/www/htdocs/analog-images/sq6.png
share/analog/images/sq7.png
@sample /var/www/htdocs/analog-images/sq7.png
share/analog/images/sq8.png
@sample /var/www/htdocs/analog-images/sq8.png
share/analog/images/sq9.png
@sample /var/www/htdocs/analog-images/sq9.png
share/analog/images/sqg.png
@sample /var/www/htdocs/analog-images/sqg.png
share/analog/lang/
share/analog/lang/README.txt
share/analog/lang/am.lng