cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* recognize MS Windows Vista; from stephan.rickauer@ini.phys.ethz.ch

Browse Source 
* fix PREFIX substitution
* regen patches
This commit is contained in:
naddy 2007-05-30 22:33:11 +00:00
parent 4aafbbaccc
commit 5bba1ec7dd
7 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/analog/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.48 2006/08/04 00:10:42 espie Exp $
# $OpenBSD: Makefile,v 1.49 2007/05/30 22:33:11 naddy Exp $
COMMENT= "extremely fast program for analysing WWW logfiles"
DISTNAME= analog-6.0
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
CATEGORIES= www
MASTER_SITES= http://www.analog.cx/ \

10
www/analog/patches/patch-anlgform_pl
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-anlgform_pl,v 1.2 2001/11/22 11:10:39 form Exp $
--- anlgform.pl.orig Wed Nov 7 17:06:34 2001
+++ anlgform.pl Thu Nov 22 17:05:08 2001
@@ -47,6 +47,8 @@ $lt = localtime;
$OpenBSD: patch-anlgform_pl,v 1.3 2007/05/30 22:33:11 naddy Exp $
--- anlgform.pl.orig Sun Dec 19 06:51:22 2004
+++ anlgform.pl Wed May 30 16:26:18 2007
@@ -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 = "/usr/local/bin/analog";
+ $analog = "@PREFIX@/bin/analog";
}
# coerce query keys to caps in a new (key, pointer to array) hash called args

8
www/analog/patches/patch-examples_big_cfg
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-examples_big_cfg,v 1.2 2001/11/22 11:10:39 form Exp $
--- examples/big.cfg.orig Wed Nov 7 17:06:35 2001
+++ examples/big.cfg Thu Nov 22 17:05:07 2001
$OpenBSD: patch-examples_big_cfg,v 1.3 2007/05/30 22:33:11 naddy Exp $
--- examples/big.cfg.orig Sun Dec 19 06:51:23 2004
+++ examples/big.cfg Wed May 30 16:25:24 2007
@@ -19,7 +19,7 @@
# it must go here, above the LOGFILE commands.
# LOGFORMAT MICROSOFT-NA
@ -18,4 +18,4 @@ $OpenBSD: patch-examples_big_cfg,v 1.2 2001/11/22 11:10:39 form Exp $
+IMAGEDIR analog-images/
#
# Whether to use PNG or GIF images
PNGIMAGES OFF
PNGIMAGES ON

10
www/analog/patches/patch-src_init2_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_init2_c,v 1.1 2005/04/18 22:32:36 naddy Exp $
--- src/init2.c.orig Sun Mar 23 14:57:02 2003
+++ src/init2.c Mon Apr 18 21:42:41 2005
@@ -244,10 +244,10 @@ void configchoice(void *opt, char *cmd,
$OpenBSD: patch-src_init2_c,v 1.2 2007/05/30 22:33:11 naddy Exp $
--- src/init2.c.orig Sun Dec 19 06:51:30 2004
+++ src/init2.c Wed May 30 16:25:24 2007
@@ -226,10 +226,10 @@ void configchoice(void *opt, char *cmd, char *arg1, ch
return;
}
@ -14,7 +14,7 @@ $OpenBSD: patch-src_init2_c,v 1.1 2005/04/18 22:32:36 naddy Exp $
choices = chartchoices;
#endif
else if (STREQ(cmd, "OUTPUT"))
@@ -260,7 +260,7 @@ void configchoice(void *opt, char *cmd,
@@ -242,7 +242,7 @@ void configchoice(void *opt, char *cmd, char *arg1, ch
choices = langchoices;
else if (STREQ(cmd, "GOTOS"))
choices = gotochoices;

10
www/analog/patches/patch-src_init_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_init_c,v 1.1 2005/04/18 22:32:36 naddy Exp $
--- src/init.c.orig Mon Apr 18 22:47:03 2005
+++ src/init.c Mon Apr 18 22:47:31 2005
@@ -1435,7 +1435,6 @@ choice strtoinfmt(Inputformat **ans, cha
$OpenBSD: patch-src_init_c,v 1.2 2007/05/30 22:33:11 naddy Exp $
--- src/init.c.orig Sun Dec 19 06:51:30 2004
+++ src/init.c Wed May 30 16:25:24 2007
@@ -1458,7 +1458,6 @@ choice strtoinfmt(Inputformat **ans, char *s, choice *
c++;
if (*c == 'S')
done = TRUE;
@ -9,7 +9,7 @@ $OpenBSD: patch-src_init_c,v 1.1 2005/04/18 22:32:36 naddy Exp $
}
}
if (!done) {
@@ -1446,7 +1445,6 @@ choice strtoinfmt(Inputformat **ans, cha
@@ -1469,7 +1468,6 @@ choice strtoinfmt(Inputformat **ans, char *s, choice *
c++;
if (*c == 's')
*c = 'S';

15
www/analog/patches/patch-src_tree_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_tree_c,v 1.1 2007/05/30 22:33:11 naddy Exp $
--- 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";

8
www/analog/patches/patch-src_utils_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_utils_c,v 1.1 2005/04/18 22:32:36 naddy Exp $
--- src/utils.c.orig Mon Apr 18 21:48:29 2005
+++ src/utils.c Mon Apr 18 21:48:56 2005
@@ -690,7 +690,7 @@ logical wildmatch(char *s, char *p, char
$OpenBSD: patch-src_utils_c,v 1.2 2007/05/30 22:33:11 naddy Exp $
--- src/utils.c.orig Sun Dec 19 06:51:31 2004
+++ src/utils.c Wed May 30 16:25:24 2007
@@ -706,7 +706,7 @@ logical wildmatch(char *s, char *p, char *whole, int n
below. */
ss = strchr(s, '\0');
pp = strchr(p, '\0');