pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/squidanalyzer/patches patch-Makefile.PL not needed...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/42618010031d
branches:  trunk
changeset: 639397:42618010031d
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Sep 12 10:39:56 2014 +0000

description:
patch-Makefile.PL not needed anymore

diffstat:

 www/squidanalyzer/patches/patch-Makefile.PL |  32 -----------------------------
 1 files changed, 0 insertions(+), 32 deletions(-)

diffs (36 lines):

diff -r a17cd91bd4b4 -r 42618010031d www/squidanalyzer/patches/patch-Makefile.PL
--- a/www/squidanalyzer/patches/patch-Makefile.PL       Fri Sep 12 10:21:42 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-$NetBSD: patch-Makefile.PL,v 1.1 2013/09/03 10:08:26 adam Exp $
-
-Introduce ETCDIR, where real configuration files are installed.
-
---- Makefile.PL.orig   2013-09-02 20:53:21.000000000 +0000
-+++ Makefile.PL
-@@ -4,7 +4,7 @@ use ExtUtils::MakeMaker;
- 
- use strict;
- 
--my @ALLOWED_ARGS = ('LOGFILE','BINDIR','CONFDIR','HTMLDIR','BASEURL','DOCDIR','MANDIR','QUIET','INSTALLDIRS','DESTDIR');
-+my @ALLOWED_ARGS = ('LOGFILE','BINDIR','ETCDIR','CONFDIR','HTMLDIR','BASEURL','DOCDIR','MANDIR','QUIET','INSTALLDIRS','DESTDIR');
- 
- # Parse command line arguments and store them as environment variables
- while ($_ = shift) {
-@@ -24,6 +24,7 @@ if (! -d $default_log ) {
- # Default install path
- my $LOGFILE = $ENV{LOGFILE} || $default_log;
- my $BINDIR = $ENV{BINDIR} || '/usr/local/bin';
-+my $ETCDIR = $ENV{ETCDIR} || '/etc/squidanalyzer';
- my $CONFDIR = $ENV{CONFDIR} || '/etc/squidanalyzer';
- my $HTMLDIR = $ENV{HTMLDIR} || '/var/www/squidanalyzer';
- my $BASEURL = $ENV{BASEURL} || '/squidreport';
-@@ -129,7 +130,7 @@ close(INST);
- `chmod 755 install_all.sh`;
- 
- # Change path into the default configuration file
--`perl -p -i -e 's#/etc/squidanalyzer#$CONFDIR#' etc/squidanalyzer.conf squid-analyzer`;
-+`perl -p -i -e 's#/etc/squidanalyzer#$ETCDIR#' etc/squidanalyzer.conf squid-analyzer`;
- `perl -p -i -e 's#^Output.*#Output    $HTMLDIR#' etc/squidanalyzer.conf`;
- `perl -p -i -e 's#^LogFile.*#LogFile  $LOGFILE#' etc/squidanalyzer.conf`;
- `perl -p -i -e 's#^WebUrl.*#WebUrl    $BASEURL#' etc/squidanalyzer.conf`;



Home | Main Index | Thread Index | Old Index