View | Details | Raw Unified | Return to bug 174582 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-13 / +8 lines)
Lines 1-13 Link Here
1
# New ports collection makefile for:	awstats
1
# Created by: Munish Chopra <mchopra@engmail.uwaterloo.ca>
2
# Date created:			May 13, 2002
3
# Whom:				Munish Chopra <mchopra@engmail.uwaterloo.ca>
4
#
5
# $FreeBSD$
2
# $FreeBSD$
6
#
7
3
8
PORTNAME=	awstats
4
PORTNAME=	awstats
9
PORTVERSION=	7.0
5
PORTVERSION=	7.1
10
PORTREVISION=	2
11
PORTEPOCH=	1
6
PORTEPOCH=	1
12
CATEGORIES=	www
7
CATEGORIES=	www
13
MASTER_SITES=	SF/${PORTNAME}/AWStats/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/AWStats/${PORTVERSION}
Lines 15-25 Link Here
15
MAINTAINER=	samm@os2.kiev.ua
10
MAINTAINER=	samm@os2.kiev.ua
16
COMMENT=	Free real-time logfile analyzer to get advanced web statistics
11
COMMENT=	Free real-time logfile analyzer to get advanced web statistics
17
12
18
RUN_DEPENDS=	p5-Net-XWhois>=0:${PORTSDIR}/net/p5-Net-XWhois
19
20
LICENSE=	GPLv2
13
LICENSE=	GPLv2
21
LICENSE_FILE=	${WRKSRC}/docs/LICENSE.TXT
14
LICENSE_FILE=	${WRKSRC}/docs/LICENSE.TXT
22
15
16
RUN_DEPENDS=	p5-Net-XWhois>=0:${PORTSDIR}/net/p5-Net-XWhois
17
23
NO_BUILD=	yes
18
NO_BUILD=	yes
24
USE_PERL5_RUN=	yes
19
USE_PERL5_RUN=	yes
25
USE_DOS2UNIX=	tools/*.pl \
20
USE_DOS2UNIX=	tools/*.pl \
Lines 37-47 Link Here
37
32
38
SUB_FILES=	pkg-message
33
SUB_FILES=	pkg-message
39
34
40
OPTIONS=	IPV6 "Enable IPV6 for use with IPv6 Plugin" Off
35
OPTIONS_DEFINE=	IPV6
41
36
42
.include <bsd.port.pre.mk>
37
.include <bsd.port.pre.mk>
43
38
44
.if defined(WITH_IPV6)
39
.if ${PORT_OPTIONS:MIPV6}
45
RUN_DEPENDS+=	p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP
40
RUN_DEPENDS+=	p5-Net-IP>=0:${PORTSDIR}/net-mgmt/p5-Net-IP
46
RUN_DEPENDS+=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
41
RUN_DEPENDS+=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
47
.endif
42
.endif
Lines 107-120 Link Here
107
	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/os/* ${PREFIX}/www/awstats/icons/os
102
	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/os/* ${PREFIX}/www/awstats/icons/os
108
	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/other/* ${PREFIX}/www/awstats/icons/other
103
	${INSTALL_DATA} ${WRKSRC}/wwwroot/icon/other/* ${PREFIX}/www/awstats/icons/other
109
	${INSTALL_DATA} ${WRKSRC}/wwwroot/js/* ${PREFIX}/www/awstats/js
104
	${INSTALL_DATA} ${WRKSRC}/wwwroot/js/* ${PREFIX}/www/awstats/js
110
.if !defined(NOPORTDOCS)
105
.if ${PORT_OPTIONS:MDOCS}
111
	@${MKDIR} ${DOCSDIR}/images
106
	@${MKDIR} ${DOCSDIR}/images
112
	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
107
	${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images
113
	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
108
	${INSTALL_DATA} ${WRKSRC}/docs/*.* ${DOCSDIR}
114
.endif
109
.endif
115
	@${ECHO_CMD} ""
110
	@${ECHO_CMD} ""
116
	@${ECHO_CMD} "* Use ${PREFIX}/www/awstats/tools/awstats_configure.pl to setup your hosts."
111
	@${ECHO_CMD} "* Use ${PREFIX}/www/awstats/tools/awstats_configure.pl to setup your hosts."
117
.if !defined(NOPORTDOCS)
112
.if ${PORT_OPTIONS:MDOCS}
118
	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"
113
	@${ECHO_CMD} "* Documentation has been installed in ${PREFIX}/share/doc/awstats"
119
.endif
114
.endif
120
	@${ECHO_CMD} ""
115
	@${ECHO_CMD} ""
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (awstats-7.0.tar.gz) = e2651d4a5ff40e1d792b37cc13784d444cae479b4f98118aed27f46f5a18ce92
1
SHA256 (awstats-7.1.tar.gz) = c58e8c57d567fadf3e948a3c27b4bc2d71e4aee04225c961cbc88ac380f8b38d
2
SIZE (awstats-7.0.tar.gz) = 1254327
2
SIZE (awstats-7.1.tar.gz) = 1260857
(-)files/patch-wwwroot-cgi-bin-awstats.pl (-31 lines)
Lines 1-31 Link Here
1
--- wwwroot/cgi-bin/awstats.pl.orig	2011-07-06 08:11:37.000000000 +0100
2
+++ wwwroot/cgi-bin/awstats.pl	2011-07-06 08:16:32.000000000 +0100
3
@@ -1353,9 +1353,7 @@
4
 #------------------------------------------------------------------------------
5
 sub OptimizeArray {
6
 	my $array = shift;
7
-	my @arrayunreg = map {
8
-		if (/\(\?[-\w]*:(.*)\)/) { $1 }
9
-	} @$array;
10
+	my @arrayunreg = map { UnCompileRegex($_) } @$array;
11
 	my $notcasesensitive = shift;
12
 	my $searchlist       = 0;
13
 	if ($Debug) {
14
@@ -3049,7 +3047,7 @@
15
 # Debian package :                    		"/usr/share/awstats/plugins"
16
 	my @PossiblePluginsDir = (
17
 		"$DIR/plugins",
18
-		"/usr/local/awstats/wwwroot/cgi-bin/plugins",
19
+		"%%PREFIX%%/www/awstats/cgi-bin/plugins",
20
 		"/usr/share/awstats/plugins"
21
 	);
22
 	my %DirAddedInINC = ();
23
@@ -7809,7 +7807,7 @@
24
 # Return:		standardregex
25
 #------------------------------------------------------------------------------
26
 sub UnCompileRegex {
27
-	shift =~ /\(\?[-\w]*:(.*)\)/;
28
+	shift =~ /\(\?[-^\w]*:(.*)\)/;
29
 	return $1;
30
 }
31
 
(-)pkg-plist (+14 lines)
Lines 315-320 Link Here
315
www/awstats/icons/cpu/motorola.png
315
www/awstats/icons/cpu/motorola.png
316
www/awstats/icons/cpu/sun.png
316
www/awstats/icons/cpu/sun.png
317
www/awstats/icons/cpu/unknown.png
317
www/awstats/icons/cpu/unknown.png
318
www/awstats/icons/flags/sl.png
319
www/awstats/icons/flags/me.png
320
www/awstats/icons/flags/gg.png
321
www/awstats/icons/flags/ax.png
318
www/awstats/icons/flags/a2.png
322
www/awstats/icons/flags/a2.png
319
www/awstats/icons/flags/ac.png
323
www/awstats/icons/flags/ac.png
320
www/awstats/icons/flags/ad.png
324
www/awstats/icons/flags/ad.png
Lines 580-585 Link Here
580
www/awstats/icons/flags/ze.png
584
www/awstats/icons/flags/ze.png
581
www/awstats/icons/flags/zm.png
585
www/awstats/icons/flags/zm.png
582
www/awstats/icons/flags/zw.png
586
www/awstats/icons/flags/zw.png
587
www/awstats/icons/mime/xsl.png
588
www/awstats/icons/mime/document.png
589
www/awstats/icons/mime/csv.png
590
www/awstats/icons/mime/runtime.png
583
www/awstats/icons/mime/ai.png
591
www/awstats/icons/mime/ai.png
584
www/awstats/icons/mime/archive.png
592
www/awstats/icons/mime/archive.png
585
www/awstats/icons/mime/audio.png
593
www/awstats/icons/mime/audio.png
Lines 619-624 Link Here
619
www/awstats/icons/mime/wmv.png
627
www/awstats/icons/mime/wmv.png
620
www/awstats/icons/mime/glasses.png
628
www/awstats/icons/mime/glasses.png
621
www/awstats/icons/mime/xls.png
629
www/awstats/icons/mime/xls.png
630
www/awstats/icons/os/macosx8.png
631
www/awstats/icons/os/macosx6.png
632
www/awstats/icons/os/macosx7.png
633
www/awstats/icons/os/macosx9.png
634
www/awstats/icons/os/macosx4.png
635
www/awstats/icons/os/macosx5.png
622
www/awstats/icons/os/aix.png
636
www/awstats/icons/os/aix.png
623
www/awstats/icons/os/amigaos.png
637
www/awstats/icons/os/amigaos.png
624
www/awstats/icons/os/apple.png
638
www/awstats/icons/os/apple.png

Return to bug 174582