[csw-devel] SF.net SVN: gar:[5717] csw/mgar/pkg/awstats/trunk

[dmichelsen at users.sourceforge.net]

Revision: 5717
          http://gar.svn.sourceforge.net/gar/?rev=5717&view=rev
Author:   dmichelsen
Date:     2009-07-29 19:08:26 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
awstats: Fix config file location

Modified Paths:
--------------
    csw/mgar/pkg/awstats/trunk/Makefile
    csw/mgar/pkg/awstats/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff

Modified: csw/mgar/pkg/awstats/trunk/Makefile
===================================================================
--- csw/mgar/pkg/awstats/trunk/Makefile	2009-07-29 19:03:19 UTC (rev 5716)
+++ csw/mgar/pkg/awstats/trunk/Makefile	2009-07-29 19:08:26 UTC (rev 5717)
@@ -18,6 +18,8 @@
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 DISTFILES += CSWawstats.postinstall
 
+PATCHFILES = patch-configdir.diff
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
@@ -36,7 +38,8 @@
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = custom
 
-PRESERVECONF = $(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW
+PRESERVECONF  = $(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW
+PRESERVECONF += $(sysconfdir)/awstats.conf.CSW
 
 ARCHALL = 1
 
@@ -57,12 +60,21 @@
 	cp -R $(WORKSRC)/wwwroot/cgi-bin/* \
 		$(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/
 
+	ginstall -d $(DESTDIR)$(sysconfdir)/awstats/
+	cat $(WORKSRC)/tools/wwwroot/cgi-bin/awstats.model.conf | perl -p -e '\
+		s!/var/log/httpd/mylog.log!/var/opt/csw/awstats!;
+		'> $(DESTDIR)$(sysconfdir)/awstats.conf.CSW
+	rm -f $(DESTDIR)$(sharedstatedir)/www/awstats/cgi-bin/awstats.model.conf
+
 	ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra/
 	cat $(WORKSRC)/tools/httpd_conf | perl -p -e '\
 		s!/usr/local/awstats/wwwroot/cgi-bin/!$(sharedstatedir)/www/awstats/cgi-bin/!; \
 		s!/usr/local/awstats/wwwroot/!$(sharedstatedir)/www/awstats/htdocs/!; \
-		s!/usr/local/awstats/wwwroot!$(sharedstatedir)/www/awstats/htdocs!;' \
-		> $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW
+		s!/usr/local/awstats/wwwroot!$(sharedstatedir)/www/awstats/htdocs!; \
+		'> $(DESTDIR)$(prefix)/apache2/etc/extra/httpd-awstats.conf.CSW
 	rm -f $(DESTDIR)$(sharedstatedir)/awstats/httpd_conf
 
 	@$(MAKECOOKIE)
+
+# ./awstats_updateall.pl now -awstatsprog=/opt/csw/share/www/awstats/cgi-bin/awstats.pl -configdir=/opt/csw/etc
+

Modified: csw/mgar/pkg/awstats/trunk/checksums
===================================================================
--- csw/mgar/pkg/awstats/trunk/checksums	2009-07-29 19:03:19 UTC (rev 5716)
+++ csw/mgar/pkg/awstats/trunk/checksums	2009-07-29 19:08:26 UTC (rev 5717)
@@ -1,2 +1,3 @@
 a6ae0f8a42dd10e41957c29ac78bbc18  download/CSWawstats.postinstall
 fc19dbb8449eccf3300efb30ca3376cb  download/awstats-6.9.tar.gz
+068ec2e8ef85b3fe8182b656ca4d8e6c  download/patch-configdir.diff

Added: csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff
===================================================================
--- csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff	                        (rev 0)
+++ csw/mgar/pkg/awstats/trunk/files/patch-configdir.diff	2009-07-29 19:08:26 UTC (rev 5717)
@@ -0,0 +1,15 @@
+diff -Naur awstats-6.9.orig/wwwroot/cgi-bin/awstats.pl awstats-6.9.patched/wwwroot/cgi-bin/awstats.pl
+--- awstats-6.9.orig/wwwroot/cgi-bin/awstats.pl	2008-11-30 16:42:46.000000000 +0100
++++ awstats-6.9.patched/wwwroot/cgi-bin/awstats.pl	2009-07-29 19:21:45.456796688 +0200
+@@ -1642,9 +1642,8 @@
+ 	}
+ 	else {
+ 		@PossibleConfigDir = (
+-							   "$DIR",                   "/etc/awstats",
+-							   "/usr/local/etc/awstats", "/etc",
+-							   "/etc/opt/awstats"
++							   "$DIR",
++							   "/etc/opt/csw/", "/opt/csw/etc/"
+ 		);
+ 	}
+ 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.