From owner-svn-ports-all@FreeBSD.ORG Tue Apr 15 14:51:33 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 628F9E32; Tue, 15 Apr 2014 14:51:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 43537152A; Tue, 15 Apr 2014 14:51:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3FEpXQI079350; Tue, 15 Apr 2014 14:51:33 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3FEpWXS079242; Tue, 15 Apr 2014 14:51:32 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201404151451.s3FEpWXS079242@svn.freebsd.org> From: Olli Hauer Date: Tue, 15 Apr 2014 14:51:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r351337 - in head/www/wwwstat: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Apr 2014 14:51:33 -0000 Author: ohauer Date: Tue Apr 15 14:51:31 2014 New Revision: 351337 URL: http://svnweb.freebsd.org/changeset/ports/351337 QAT: https://qat.redports.org/buildarchive/r351337/ Log: - add stage support - use PERL instead of PERL5 in scripts - rename patch files - move text displayed with ECHO_MSG into pkg-message Added: head/www/wwwstat/files/patch-Makefile - copied, changed from r351333, head/www/wwwstat/files/patch-ac head/www/wwwstat/files/patch-splitlog.rc - copied unchanged from r351333, head/www/wwwstat/files/patch-ab head/www/wwwstat/files/patch-wwwstat.rc - copied unchanged from r351333, head/www/wwwstat/files/patch-aa Deleted: head/www/wwwstat/files/patch-aa head/www/wwwstat/files/patch-ab head/www/wwwstat/files/patch-ac Modified: head/www/wwwstat/Makefile head/www/wwwstat/pkg-plist Modified: head/www/wwwstat/Makefile ============================================================================== --- head/www/wwwstat/Makefile Tue Apr 15 14:48:12 2014 (r351336) +++ head/www/wwwstat/Makefile Tue Apr 15 14:51:31 2014 (r351337) @@ -2,7 +2,7 @@ PORTNAME= wwwstat PORTVERSION= 2.01 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= ftp://ftp.ics.uci.edu/pub/websoft/wwwstat/ \ ftp://ftp.gwdg.de/pub/misc/www-stat/websoft/wwwstat/ @@ -14,28 +14,22 @@ PATCHFILES= patch-2.01.txt MAINTAINER= ports@FreeBSD.org COMMENT= Webserver logfile analysis package +LICENSE= ART10 USE_APACHE_RUN= 22+ USES= perl5 -MAKE_ENV+= PERL5=${PERL5} +MAKE_ENV+= PERL=${PERL} +SUB_FILES= pkg-message +SUB_LIST= SITE_PERL=${SITE_PERL} + +BIN_FILES= monthly oldlog2new splitlog wwwerrs wwwstat +SPERL_FILES= domains.pl splitlog.rc wwwstat.rc +MAN1_FILES= wwwstat.1 splitlog.1 -MAN1= wwwstat.1 splitlog.1 - -NO_STAGE= yes do-install: - @${INSTALL_SCRIPT} ${WRKSRC}/wwwstat ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/splitlog ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/monthly ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/wwwerrs ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/oldlog2new ${PREFIX}/bin - @${INSTALL_MAN} ${WRKSRC}/wwwstat.1 ${PREFIX}/man/man1 - @${INSTALL_MAN} ${WRKSRC}/splitlog.1 ${PREFIX}/man/man1 - @${INSTALL_DATA} ${WRKSRC}/wwwstat.rc ${SITE_PERL} - @${INSTALL_DATA} ${WRKSRC}/splitlog.rc ${SITE_PERL} - @${INSTALL_DATA} ${WRKSRC}/domains.pl ${SITE_PERL} - @${ECHO_MSG} "Edit the wwwstat.rc and splitlog.rc file ..." - @${ECHO_MSG} "If needed, edit wwwstat and splitlog directly ..." - @${ECHO_MSG} "These files are located in:" - @${ECHO_MSG} " ${SITE_PERL}" + @${INSTALL_SCRIPT} ${BIN_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${SITE_PERL} + @${INSTALL_DATA} ${SPERL_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${SITE_PERL} + @${INSTALL_MAN} ${MAN1_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1 .include Copied and modified: head/www/wwwstat/files/patch-Makefile (from r351333, head/www/wwwstat/files/patch-ac) ============================================================================== --- head/www/wwwstat/files/patch-ac Tue Apr 15 13:47:35 2014 (r351333, copy source) +++ head/www/wwwstat/files/patch-Makefile Tue Apr 15 14:51:31 2014 (r351337) @@ -5,7 +5,7 @@ # of your perl interpreter -PERLBIN = /usr/local/bin/perl -+PERLBIN = $(PERL5) ++PERLBIN = $(PERL) # and here are a some commands that may be system-dependent Copied: head/www/wwwstat/files/patch-splitlog.rc (from r351333, head/www/wwwstat/files/patch-ab) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/wwwstat/files/patch-splitlog.rc Tue Apr 15 14:51:31 2014 (r351337, copy of r351333, head/www/wwwstat/files/patch-ab) @@ -0,0 +1,15 @@ +--- splitlog.rc.orig Sun Mar 2 18:50:00 1997 ++++ splitlog.rc Sun Mar 2 18:51:21 1997 +@@ -41,10 +41,12 @@ + # Specify the default location of your access log + # + ## $DefaultLog = '/usr/local/etc/httpd/logs/access_log'; ++$DefaultLog = '/var/log/httpd-access.log'; + # + # Specify the default destination directory for the split logfiles + # + ## $DestDir = ''; # current directory ++$DestDir = '/tmp'; # current directory + # + # Specify the filename (no .ext) for non-matching, non-split log entries + # Copied: head/www/wwwstat/files/patch-wwwstat.rc (from r351333, head/www/wwwstat/files/patch-aa) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/wwwstat/files/patch-wwwstat.rc Tue Apr 15 14:51:31 2014 (r351337, copy of r351333, head/www/wwwstat/files/patch-aa) @@ -0,0 +1,10 @@ +--- wwwstat.rc.orig Sun Mar 2 18:49:48 1997 ++++ wwwstat.rc Sun Mar 2 18:52:17 1997 +@@ -93,6 +93,7 @@ + # Specify the default location of your access log + # + ## $DefaultLog = '/usr/local/etc/httpd/logs/access_log'; ++$DefaultLog = '/var/log/httpd-access.log'; + # + # Specify the command for displaying compressed files to STDOUT + # Modified: head/www/wwwstat/pkg-plist ============================================================================== --- head/www/wwwstat/pkg-plist Tue Apr 15 14:48:12 2014 (r351336) +++ head/www/wwwstat/pkg-plist Tue Apr 15 14:51:31 2014 (r351337) @@ -6,3 +6,5 @@ bin/wwwstat %%SITE_PERL%%/domains.pl %%SITE_PERL%%/splitlog.rc %%SITE_PERL%%/wwwstat.rc +man/man1/splitlog.1.gz +man/man1/wwwstat.1.gz