cleanup, version bump, reorganise /etc/modlogan to be more sensible.

14 files changed, 611 insertions, 797 deletions

diff --git a/app-admin/modlogan/ChangeLog b/app-admin/modlogan/ChangeLog
index 63cb602f47cc..0107a427219a 100644
--- a/app-admin/modlogan/ChangeLog
+++ b/app-admin/modlogan/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/modlogan
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/ChangeLog,v 1.17 2004/10/05 02:58:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/ChangeLog,v 1.18 2004/10/17 17:14:12 liquidx Exp $
+
+*modlogan-0.8.13 (17 Oct 2004)
+
+  17 Oct 2004; Alastair Tse <liquidx@gentoo.org> metadata.xml,
+  -files/modlogan.conf, -files/sample.conf, -files/sample.def.conf,
+  +files/0.8.13/modlogan.conf, +files/0.8.13/sample.conf,
+  +files/0.8.13/sample.def.conf, -modlogan-0.7.18.ebuild,
+  -modlogan-0.7.4-r1.ebuild, -modlogan-0.8.10.ebuild,
+  +modlogan-0.8.13.ebuild:
+  cleanup, version bump, reorganise /etc/modlogan to be more sensible.
 
   05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   modlogan-0.8.10-r1.ebuild, modlogan-0.8.10.ebuild:
diff --git a/app-admin/modlogan/files/modlogan.conf b/app-admin/modlogan/files/0.8.13/modlogan.conf
index 31dc9f39fab2..5087842e0dbd 100644
--- a/app-admin/modlogan/files/modlogan.conf
+++ b/app-admin/modlogan/files/0.8.13/modlogan.conf
@@ -1,13 +1,10 @@
 #
 # This is the config file for modlogan-statistics
 #
-<Directory "/usr/local/httpd/modlogan">
+<Directory "/var/www/localhost/htdocs/modlogan">
   Options None
   AllowOverride None
 
   Order allow,deny
   Allow from all
 </Directory>
-
-Alias /modlogan/ "/usr/local/httpd/modlogan/"
-
diff --git a/app-admin/modlogan/files/0.8.13/sample.conf b/app-admin/modlogan/files/0.8.13/sample.conf
new file mode 100644
index 000000000000..1e12b61598e6
--- /dev/null
+++ b/app-admin/modlogan/files/0.8.13/sample.conf
@@ -0,0 +1,113 @@
+# ModLogAn configuration file 
+#
+# 1. Format:
+# - lines starting with '#' are comments
+# - empty lines are ignored
+# - every other line has consist of a key-value pair
+# - a key-value pair has to be seperated by an equal-sign '='
+#
+# 2. Whitespaces:
+# - whitespaces at the end of key are ignored
+# - whitespaces at the end of value are ignored
+# - whitespaces at the beginning of value are ignored
+# example:
+#   inputplugin=clf
+# and
+#   inputplugin = clf 
+# are the same.
+#
+# 3. Wildcardmatching:
+# every key that starts with
+# - hide
+# - group
+# - match
+# has support for wildcard matching. the wildcard is the '*' and is allowed 
+# at the beginning and at the end of the value
+#
+# 4. sections
+# The configuration file is seperated into three parts
+# - [global]
+# - [input]
+# - [output]
+# - [processor]
+# the 'global'-section has to be at the top if the config-file. 
+# the keys for the input and the output section are plugin specific
+
+# for the avaible options and if they can be overwritten, look at 
+# ./doc/plugin-options.txt
+# for a description and examples of the options take a look at the
+# sample default-configfile ./doc/sample.def.conf
+
+# how include works:
+# 	include=<path to config file>,<name of section to include>
+#
+# to use the default options of the input_clf section from the default
+# configuration, one would use this: 
+#	include=/etc/modlogan/modlogan.def.conf,input_clf
+#
+# you can still overwrite options after the include line:
+#	include=/etc/modlogan/modlogan.def.conf,input_clf
+#	readaheadlimit=25
+
+#
+# global configuration section
+#
+[global]
+includepath=/etc/modlogan
+# include configuration from default config into this section
+include=modlogan.def.conf,global
+# load plugins
+loadplugin=input_clf
+loadplugin=output_modlogan
+loadplugin=processor_web
+
+# where to store statefiles ?
+statedir=/var/www/localhost/htdocs/modlogan/
+incremental=1
+
+# uncomment this, to get a list of supported options
+#show_available_config_options=1
+
+#
+# configuration for web processor plugin
+#
+[processor_web]
+include=modlogan.def.conf,processor_web
+hidereferrer="^http://##HOST2##"
+#splitby=srvhost,"(.*)",$1
+debug_searchengines=1
+
+
+#
+# configuration for modlogan output plugin
+#
+[output_modlogan]
+include=modlogan.def.conf,output_modlogan
+hostname=##HOST##
+outputdir=/var/www/localhost/htdocs/modlogan/
+
+#
+# configuration for template output plugin
+# (use loadplugin = output_template
+# instead of output_modlogan to use this)
+#
+[output_template]
+include=modlogan.def.conf,output_template
+include=modlogan.def.conf,output_template_reports_web
+include=modlogan.def.conf,output_template_menu_web
+hostname=##HOST##
+outputdir=/var/www/localhost/htdocs/modlogan/
+
+# to use another theme, see /usr/share/modlogan/themes/
+# for names (basic is default)
+#template_name = basic
+
+
+#
+# configuration for clf format input plugin
+#
+[input_clf]
+include=modlogan.def.conf,input_clf
+# read from stdin
+inputfile=-
+
diff --git a/app-admin/modlogan/files/0.8.13/sample.def.conf b/app-admin/modlogan/files/0.8.13/sample.def.conf
new file mode 100644
index 000000000000..433817f86f7b
--- /dev/null
+++ b/app-admin/modlogan/files/0.8.13/sample.def.conf
@@ -0,0 +1,439 @@
+# $Id: sample.def.conf,v 1.1 2004/10/17 17:14:12 liquidx Exp $
+
+[global]
+# Compress XML state files with max gzip compression
+compress_mode=9
+
+## let modlogan decide what a read-ahead-limit might be the best
+read_ahead_limit = 0
+
+########## WEB Processor Section
+[processor_web]
+include		= /etc/modlogan/group.ua.conf,groupua
+include		= /etc/modlogan/group.os.conf,groupos
+# Host grouping has been split into some groups to allow
+# for detailed reports if you have lot's of visitors from germany etc.
+include		= /etc/modlogan/group.host.conf,grouphosts_germany
+include		= /etc/modlogan/group.host.conf,grouphosts_austria
+include		= /etc/modlogan/group.host.conf,grouphosts_us
+include		= /etc/modlogan/group.host.conf,grouphosts_misc
+# these two groupings should reasonably group most hosts
+include		= /etc/modlogan/group.host.conf,grouphosts_generic
+include		= /etc/modlogan/group.host.conf,grouphosts_ip
+include		= /etc/modlogan/group.extension.conf,groupext
+include		= /etc/modlogan/group.url.conf,groupurl
+
+include         = /etc/modlogan/group.searchengines.conf,group_searchengines
+include         = /etc/modlogan/ignore.searchengines.conf,ignore_searchengines
+include         = /etc/modlogan/match.searchengines.conf,match_searchengines
+
+
+
+maxhostcacheentries  = 100
+
+## max count of hits per visit 
+# kill endless visits 
+max_hits_per_visit = 1000
+
+debug_searchengines =	0
+visit_timeout	=	1800
+debug_visits	=	0
+
+# log ungrouped searchengines
+log_ungrouped_searchengines = 0
+log_ungrouped_searchengines_file = ungrouped_searchengines.txt
+
+# decode searchstring
+decode_searchstrings = 1
+
+# Hide supplementary files such as images
+hideurl="\.(?i:gif|png|jpe?g|css|js|class|mid|swf)(?:\?|$)"
+# Hide Robots / Bookmarks from main Report
+hideurl="^/(?:robots.txt|favicon.ico)$"
+
+# Direct Accesses (no known referrer)
+groupreferrer="^-$",(Direct Access / no known referrer)
+
+groupsearchstrings="cache:.*? ",(Google Cache)
+# group lowercase
+groupsearchstrings="^(.*)$",$_1
+
+# Some special common broken links
+groupbrokenlinks="favicon\.ico$",Bookmarking Icons for MSIE 5.0, Galeon
+groupbrokenlinks="robots\.txt$",Robot control file /robots.txt
+
+# url that should be counted as pages
+## pages that end with a '/' are index-pages
+pagetype="/$"
+## default page names - single expression for speed
+pagetype="\.(?i:php[34]?|html?|phtml|shtml|asp|cgi|pl|jsp)(?:\?|$)"
+
+# To hide downloads such as Postscript, include this via
+# include = modlogan.def.conf,hide_downloads
+[hide_downloads]
+hideurl="\.(?i:mp3|mpg|pdf|ps|ps\.gz|zip|tgz|deb|rpm|rar|tar\.gz|bz3)$"
+
+########## OUTPUT Section
+[output_modlogan]
+## < 0 for all, 0 for none
+maxrequrls	= 30
+maxrefurls	= 30
+maxos		= 50
+maxhosts	= 30
+maxentrypages	= 10
+maxexitpages	= 10
+maxindexedpages	= 20
+maxua		= 30
+maxreqprot	= 10
+maxreqmeth	= 10
+maxstatuscodes	= 10
+maxrobots	= 20
+maxbookmarks	= 20
+maxbrokenlinks	= 20
+maxsearchengines= 20
+maxsearchstrings= 30
+maxinteralerrors= 20
+maxcountries	= 20
+maxextensions	= 20
+maxvisitpaths	= 20
+maxvisitdurations = 20
+maxvisitpathlengths = 20
+maxviewdurations = 20
+maxvhosts = 100
+maxgraphedmonths = 13
+
+showdailygraph	= 1
+showmonthlygraph = 1
+showhourlygraph = 1
+showcountrygraph = 1
+showvhostgraph = 1
+
+showmonthinmenu = 1
+showmonthlymaxima = 1
+
+showmonthlygraphgrid = 1
+grid = #000000
+
+showvalidationlinks = 1
+
+assumedprotocol = http
+
+pagestyle	= seppage
+
+## Template names
+#htmlheader	= header.ihtml
+#htmlfooter	= footer.ihtml
+# this is NOT how the file in the output will be called!
+# this is the file name of the source file.
+cssfile		= /etc/modlogan/modlogan.css
+
+# HTML colors are in the CSS file, these colors are for
+# generating the graphics only.
+background	= #ffffff
+foreground	= #000000
+border		= #000000
+shadow		= #999999
+pages		= #00c0ff
+files		= #0080ff
+visits		= #ffff00
+xfer		= #ff0000
+hits		= #00C030
+
+country_circle = #AF0000
+country_circle = #FF0000
+country_circle = #FF6400
+country_circle = #FFB900
+country_circle = #8CFF00
+country_circle = #00C800
+country_circle = #007B00
+country_circle = #0058FF
+country_circle = #009EFF
+country_circle = #0000FF
+country_circle = #000082
+
+# Vhost chart colors
+# added by sysman@sysman.net
+vhost_circle = #CC9933
+vhost_circle = #FF0066
+vhost_circle = #FF6600
+vhost_circle = #FFBB00
+vhost_circle = #CCFF00
+vhost_circle = #00CC00
+vhost_circle = #008800
+vhost_circle = #0066FF
+vhost_circle = #00CCFF
+vhost_circle = #0000FF
+vhost_circle = #000099
+
+########## Webalizer-Lookalike output section
+[output_webalizer]
+maxrequrls	= 30
+maxrefurls	= 30
+maxos		= 50
+maxhosts	= 30
+maxentrypages	= 10
+maxexitpages	= 10
+maxindexedpages	= 20
+maxua		= 30
+maxreqprot	= 10
+maxreqmeth	= 10
+maxstatuscodes	= 10
+maxrobots	= 20
+maxbookmarks	= 20
+maxbrokenlinks	= 20
+maxsearchengines= 20
+maxsearchstrings= 30
+maxinteralerrors= 20
+maxcountries	= 20
+
+# colors
+# the notation is #RRGGBB (HTML-color-tripple)
+background	= #c0c0c0
+shadow		= #808080
+pages		= #00c0ff
+files		= #0080ff
+visits		= #ffff00
+xfer		= #ff0000
+hosts		= #ff8000
+hits		= #00C030
+grouping	= #D0D0E0
+body		= #FFFFFF
+
+########## TEXT Output Section
+[output_text]
+
+########## TKControl Output
+[output_tkcontrol]
+maxcallednumbers	= 20
+maxcallingnumbers	= 20
+
+background	= #c0c0c0
+shadow		= #808080
+outgoing	= #00c0ff
+incoming	= #00C030
+grouping	= #D0D0E0
+body		= #FFFFFF
+calls		= #00ffff
+
+########## COMMON LOGFILE FORMAT input section
+[input_clf]
+include		= /etc/modlogan/match.useragents.conf,match_useragents
+
+# Default input is stdin
+inputfile	= -
+
+########## Microsoft IIS input section
+[input_msiis]
+include		= /etc/modlogan/match.os.conf,matchos
+include		= /etc/modlogan/match.ua.conf,matchua
+
+# Default input is stdin
+inputfile	= -
+
+[input_wuftpd]
+# Default input is stdin
+inputfile	= -
+
+[input_realserver]
+# Default input is stdin
+inputfile	= -
+
+[input_squid]
+# Default input is stdin
+inputfile	= -
+
+[output_template]
+# {NAME} and {DATE} will be replaced. The rest of the filename is yours
+filename_pattern = mla-{NAME}-{DATE}.html
+index_filename = index.html
+template_path = /usr/share/modlogan/themes/
+template_name = basic
+
+assumedprotocol = http
+
+[output_template_reports_web]
+# enabling all available reports for the web-logs
+report = web_request_url
+report = web_request_url_traffic
+report = web_request_protocol
+report = web_request_method
+report = web_request_status
+report = web_request_extensions
+report = web_request_extensions_traffic
+report = web_user_users
+report = web_user_users_traffic
+
+report = web_user_referer
+report = web_user_os
+report = web_user_os_visits
+report = web_user_host
+report = web_user_host_visits
+report = web_user_useragent
+report = web_user_useragent_visits
+report = web_user_bookmarks
+report = web_user_countries
+report = web_user_countries_visits
+report = web_user_view_duration
+report = web_user_view_duration_visits
+report = web_user_view_duration_average
+
+report = web_visit_entry_pages
+report = web_visit_exit_pages
+report = web_visit_path
+report = web_visit_path_length
+report = web_visit_duration
+
+report = web_robot_indexed_pages
+report = web_robot_names
+report = web_robot_searchengine
+report = web_robot_seachstrings
+
+report = web_server_broken_links
+report = web_server_internal_errors
+report = web_server_vhosts
+
+report = web_generic_summary
+report = web_generic_hourly
+report = web_generic_daily
+
+[output_template_menu_web]
+## create a menu for the reports 
+
+## with menuentry you can build menu-tree
+## menuentry = <parent>,<child>
+##
+## The first used parent is the root node, here: start
+##
+## if <child> is the name of a report, the specified report is assigned
+## to this menuentry
+
+menuentry = start,web_generic_summary
+menuentry = start,web_generic_hourly
+menuentry = start,web_generic_daily
+
+menuentry = start, req
+menuentry = start, user
+menuentry = start, visits
+menuentry = start, robots
+menuentry = start, server
+
+## declare a title for the pages which are not assigned to a report
+
+menutitle = start, Top
+menutitle = req, Requests
+menutitle = user, Users
+menutitle = robots, Robots
+menutitle = server, Server
+menutitle = visits, Visits
+
+menuentry = req,web_request_url
+menuentry = req,web_request_url_traffic
+menuentry = req,web_request_protocol
+menuentry = req,web_request_method
+menuentry = req,web_request_status
+menuentry = req,web_request_extensions
+menuentry = req,web_request_extensions_traffic
+menuentry = req,web_user_users
+menuentry = req,web_user_users_traffic
+
+menuentry = user,web_user_referer
+menuentry = user,web_user_os
+menuentry = user,web_user_os_visits
+menuentry = user,web_user_host
+menuentry = user,web_user_host_visits
+menuentry = user,web_user_useragent
+menuentry = user,web_user_useragent_visits
+menuentry = user,web_user_bookmarks
+menuentry = user,web_user_countries
+menuentry = user,web_user_countries_visits
+menuentry = user,web_user_view_duration
+menuentry = user,web_user_view_duration_visits
+menuentry = user,web_user_view_duration_average
+
+menuentry = visits,web_visit_entry_pages
+menuentry = visits,web_visit_exit_pages
+menuentry = visits,web_visit_path
+menuentry = visits,web_visit_path_length
+menuentry = visits,web_visit_duration
+
+menuentry = robots,web_robot_indexed_pages
+menuentry = robots,web_robot_names
+menuentry = robots,web_robot_searchengine
+menuentry = robots,web_robot_seachstrings
+
+menuentry = server,web_server_broken_links
+menuentry = server,web_server_internal_errors
+menuentry = server,web_server_vhosts
+
+[output_template_menu_web_german_titles]
+menutitle = start, Start
+menutitle = req, Anfragen
+menutitle = user, Nutzer
+menutitle = robots, Roboter
+menutitle = server, Server
+menutitle = visits, Besuche
+
+[output_template_reports_mail]
+report = mail_daily
+report = mail_hourly
+report = mail_sender
+report = mail_sender_traffic
+report = mail_receipient
+report = mail_receipient_traffic
+report = mail_incoming_domains
+report = mail_incoming_domains_traffic
+report = mail_outgoing_domains
+report = mail_outgoing_domains_traffic
+
+[output_template_reports_mail_qmail]
+report = mail_qmail_queue_pollution
+
+[output_template_reports_mail_virus]
+report = mail_virus
+report = mail_scanner
+report = mail_subject
+
+[output_template_menu_mail]
+menuentry = start, mail_daily
+menuentry = start, mail_hourly
+menuentry = start, email
+menuentry = start, domains
+menuentry = email, mail_sender
+menuentry = email, mail_sender_traffic
+menuentry = email, mail_receipient
+menuentry = email, mail_receipient_traffic
+menuentry = domains, mail_incoming_domains
+menuentry = domains, mail_incoming_domains_traffic
+menuentry = domains, mail_outgoing_domains
+menuentry = domains, mail_outgoing_domains_traffic
+
+menutitle = start, Top
+menutitle = email, Mail-Adresses
+menutitle = domains, Domains
+
+[output_template_menu_mail_german_titles]
+menutitle = start, Hier gehts los
+menutitle = email, Email-Adressen
+menutitle = domains, Domains
+
+[output_template_menu_mail_qmail]
+menuentry = start, qmail
+menuentry = qmail, mail_qmail_queue_pollution
+menutitle = qmail, Qmail
+
+[output_template_menu_mail_virus]
+menuentry = start, virus
+menuentry = virus, mail_virus
+menuentry = virus, mail_scanner
+menuentry = virus, mail_subject
+menutitle = virus, Virus Information
+
+[output_template_localizer]
+report          = web_user_location_cities
+report          = web_user_location_provinces
+report          = web_user_location_countries
+report          = web_user_location_provider
+menuentry       = user,web_user_location_cities
+menuentry       = user,web_user_location_provinces
+menuentry       = user,web_user_location_countries
+menuentry       = user,web_user_location_provider
diff --git a/app-admin/modlogan/files/digest-modlogan-0.7.18 b/app-admin/modlogan/files/digest-modlogan-0.7.18
deleted file mode 100644
index ab048c2c383c..000000000000
--- a/app-admin/modlogan/files/digest-modlogan-0.7.18
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 5ec7adf81098172faa8ae185f001b2da modlogan-0.7.18.tar.gz 1037916
-MD5 46768d1d4af9f3f503f7f32ac4127c7a gd-1.8.1.tar.gz 260967
diff --git a/app-admin/modlogan/files/digest-modlogan-0.7.4-r1 b/app-admin/modlogan/files/digest-modlogan-0.7.4-r1
deleted file mode 100644
index 30175aa638f8..000000000000
--- a/app-admin/modlogan/files/digest-modlogan-0.7.4-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 74d481b225a45bf7e1a3816ffa987395 modlogan-0.7.4.tar.gz 885444
-MD5 46768d1d4af9f3f503f7f32ac4127c7a gd-1.8.1.tar.gz 260967
diff --git a/app-admin/modlogan/files/digest-modlogan-0.8.10 b/app-admin/modlogan/files/digest-modlogan-0.8.10
deleted file mode 100644
index c4b60150a8a7..000000000000
--- a/app-admin/modlogan/files/digest-modlogan-0.8.10
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 caf689da199b0c4b01b29aeefcbe6171 modlogan-0.8.10.tar.gz 988443
-MD5 46768d1d4af9f3f503f7f32ac4127c7a gd-1.8.1.tar.gz 260967
diff --git a/app-admin/modlogan/files/digest-modlogan-0.8.13 b/app-admin/modlogan/files/digest-modlogan-0.8.13
new file mode 100644
index 000000000000..8153c1d2537e
--- /dev/null
+++ b/app-admin/modlogan/files/digest-modlogan-0.8.13
@@ -0,0 +1,2 @@
+MD5 ba40c64f905a8d57edc3db5d9babfbfb modlogan-0.8.13.tar.gz 1081773
+MD5 fe530dec989f1df5c85fcdf502be49d0 modlogan-themes-0.0.7.tar.gz 91492
diff --git a/app-admin/modlogan/files/sample.conf b/app-admin/modlogan/files/sample.conf
deleted file mode 100644
index 7e8f9cebb12a..000000000000
--- a/app-admin/modlogan/files/sample.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: sample.conf,v 1.1 2001/01/19 20:28:52 achim Exp $
-
-# ModLogAn configuration file 
-#
-# 1. Format:
-# - lines starting with '#' are comments
-# - empty lines are ignored
-# - every other line has consist of a key-value pair
-# - a key-value pair has to be seperated by an equal-sign '='
-#
-# 2. Whitespaces:
-# - whitespaces at the end of key are ignored
-# - whitespaces at the end of value are ignored
-# - whitespaces at the beginning of value are ignored
-# example:
-#   inputplugin=clf
-# and
-#   inputplugin = clf 
-# are the same.
-#
-# 3. Wildcardmatching:
-# every key that starts with
-# - hide
-# - group
-# - match
-# has support for wildcard matching. the wildcard is the '*' and is allowed 
-# at the beginning and at the end of the value
-#
-# 4. sections
-# The configuration file is seperated into three parts
-# - [global]
-# - [input]
-# - [output]
-# - [processor]
-# the 'global'-section has to be at the top if the config-file. 
-# the keys for the input and the output section are plugin specific
-
-# global section
-## IMPORTANT: the 'default_configfile'-key has to be below the plugin
-## definition. otherwise the default values for the plugin names are used
-## as they can't be set to another value later !!
-
-# for the avaible options and if they can be overwritten, look at 
-# ./doc/plugin-options.txt
-# for a description and examples of the options take a look at the
-# sample default-configfile ./doc/sample.def.conf
-
-[global]
-#inputplugin=null
-#outputplugin=modlogan
-#processorplugin=web
-default_configfile=/etc/modlogan/modlogan.def.conf
-
-outputdir=/usr/local/httpd/modlogan/
-incremental=1
-debug_level=1
-
-[processor_web]
-searchengines=/etc/modlogan/modlogan.searchengines
-debug_searchengines=1
-hidereferrer="^http://##HOST2##"
-
-#splitby=srvhost,"(.*)",$1
-
-[output_modlogan]
-hostname=##HOST##
-
-[input_clf]
-inputfile=-
-
-#readaheadlimit=100
diff --git a/app-admin/modlogan/files/sample.def.conf b/app-admin/modlogan/files/sample.def.conf
deleted file mode 100644
index c8cf514daa10..000000000000
--- a/app-admin/modlogan/files/sample.def.conf
+++ /dev/null
@@ -1,482 +0,0 @@
-# $Id: sample.def.conf,v 1.1 2001/01/19 20:28:52 achim Exp $
-
-# ModLogAn default configuration file 
-#
-# 1. Format:
-# - lines starting with '#' are comments
-# - empty lines are ignored
-# - every other line has consist of a key-value pair
-# - a key-value pair has to be seperated by an equal-sign '='
-#
-# 2. Whitespaces:
-# - whitespaces at the end of key are ignored
-# - whitespaces at the end of value are ignored
-# - whitespaces at the beginning of value are ignored
-# example:
-#   inputplugin=clf
-# and
-#   inputplugin = clf 
-# are the same.
-#
-# 3. Wildcardmatching:
-# every key that starts with
-# - hide
-# - group
-# - match
-# has support for wildcard matching. the wildcard is the '*' and is allowed 
-# at the beginning and at the end of the value
-#
-# 4. sections
-# the configfile is divided into four section:
-# -> global, input, output, processor
-# 
-# the 'global'-section is special and has to be at the top if the config-file. 
-# the other sections (input, output, processor) correnspond to the different
-# plugins. As every plugin has its own configfile options they have to be
-# seperated in the configfile
-#   this achieved by appending a '_' and the plugin-name after the section
-# name.
-# e.g:
-# [global]     -> global section
-# [input_clf]  -> input section, only parsed und used if the clf input plugin 
-#                 is selected
-# [input]      -> section input (for backward compatibility), parsed by
-#                 every input plugin (deprecated)
-
-# global section
-[global]
-# input plugin (wuftpd, clf, null, msiis, hicom116, isdnlog, elmeg)
-inputplugin=clf
-
-# output plugin (modlogan, csv, webalizer, text, tkcontrol)
-outputplugin=modlogan
-
-# processor plugin (web,telecom)
-processorplugin=web
-
-# used output language (default: == env LC_ALL) [not used yet]
-#language=
-
-# where to put the generated files
-##
-#outputdir=/usr/local/httpd/modlogan
-
-# incremental mode (0 = off, 1 = semi, 2 = full)
-## If you are rotating your logfile more than once a month, the incremental 
-## processing feature will save you a lot of time.
-## modlogan saves the data of the last run in a file (modlogan.state). This
-## enables you to run modlogan everytime you rotated your logfiles. You
-## don't have to reparse the whole month.
-## 
-## 0: incremental mode off. the state file will be ignored and every record 
-##    will be parsed
-## 1: semi-incremental mode on. if the first records of the parsed logfile
-##    are older than the last timestamp from the state-file the records 
-##    will be ignored
-## 2: full-incremental mode on. if the first records of the parsed logfile
-##    are older than the last timestamp from the state-file the records  
-##    will be counted, but their timestamps will be ignored
-##
-incremental=1
-
-# global debug level
-## 
-##  0: be quiet, only error messages and the greeting
-##  1: verbose, add some status messages
-##  2: add warning
-## >2: talk about everything
-debug_level=1
-
-[processor_web]
-# path to the searchengines description file
-searchengines=/etc/modlogan/modlogan.searchengines
-
-# timeout for a visit count (in seconds) (default = 1800)
-## - every hit from the same url that comes in within a specified timeframe
-##   is counted as one visits
-visit_timeout=1800
-
-# debug options
-## searchengines
-## - every referrer the contains a '?' is checked if it matches one of the
-##   strings in the searchengine-definition file. If no matching string is 
-##   found this option enables the output of the checked referrer.
-## - this information can be used to improve the searchengine-definition
-##   file. Read ./doc/adding-searchengines.txt for more information on this
-##   topic
-## - valid values are 0,1,2 for the different output levels:
-##   0: quiet
-##   1: output urls which contain a matching searchkey, but no matching site 
-##      (recommend for those who want a more accurate report)
-##   2: output urls which contain the '?' but didn't match a searchkey, too
-debug_searchengines=0
-
-## visits
-## - to get a clue how a visit is setup this option enable the output of
-##   every hit and how it corresponds to a visit
-## 
-## the following output is generated by this option:
-#> process.is_visit: -> host5-99-45-76.btinternet.com, time: 957132111
-#> process.is_visit: -- host5-99-45-76.btinternet.com, time: 957132121 - 10
-#> process.is_visit: <- host5-99-45-76.btinternet.com, time: 957132242 - 1851
-## 
-## explanation:
-## process.is_visit: -> 
-## - the visit from host5-99-45-76.btinternet.com starts at 957132111.
-## process.is_visit: --
-## - 10 seconds later (957132121 - 10) another hits from the same host occurs
-## process.is_visit: <-
-## - 1851 seconds after the last hit the visit is finished 
-## 
-debug_visits=0
-
-# hide an url
-## the following URL are hidden (images)
-hideurl="\.gif$"
-hideurl="\.png$"
-hideurl="\.GIF$"
-hideurl="\.PNG$"
-hideurl="\.jpg$"
-hideurl="\.JPG$"
-
-# hide a refferer
-## the referrer stats should only contain the external referrer. 
-## you probably want to put your own url here:
-hidereferrer="^http://##HOST2##"
-
-# group the referrers
-groupreferrer="^-$","(Direct Access)"
-#groupreferrer="samba/GUI",www.samba.org UserInterfaces
-#groupreferrer="samba/docs/ntdom_faq",www.samba.org NT Domain FAQ
-#groupreferrer="/listproc/samba-ntdom/",www.samba.org NT Domain Mailinglist
-
-#grouphosts="\.dip\.t-dialin\.net$",dip.t-dialin.net
-#grouphosts="\.arcor-ip\.net$",arcor-ip.net
-#grouphosts="\.Concordia\.CA$",Concordia.CA
-
-# group broken links
-## by default the various favicon should be grouped. if you want to know 
-groupbrokenlinks="favicon\.ico$",Bookmarking Icons for MSIE 5.0
-
-groupos="Windows 98$",Windows 98
-groupos="Windows 95$",Windows 95
-groupos="Windows NT",Windows NT
-groupos="WinNT$",Windows NT
-groupos="Win98$",Windows 98
-groupos="Win95$",Windows 95
-groupos="^Linux 2\.4\.",Linux 2.4.x
-groupos="^Linux 2\.3\.",Linux 2.3.x
-groupos="^Linux 2\.2\.",Linux 2.2.x
-groupos="^Linux 2\.1\.",Linux 2.1.x
-groupos="^Linux 2\.0\.",Linux 2.0.x
-groupos="^FreeBSD 2\.",FreeBSD 2.x
-groupos="^FreeBSD 3\.",FreeBSD 3.x
-groupos="^FreeBSD 4\.",FreeBSD 4.x
-groupos="^SunOS 5\.5",SunOS 5.5.x
-groupos="^SunOS 5\.6",SunOS 5.6.x
-groupos="^SunOS 5\.7",SunOS 5.7.x
-groupos="^SunOS 5\.8",SunOS 5.8.x
-groupos="^HP-UX B\.10\.",HP-UX B.10.x
-groupos="^HP-UX B\.11\.",HP-UX B.11.x
-groupos="^NetBSD 1\.4\.",NetBSD 1.4.x
-
-groupua="^MSIE 5\.5",Internet Explorer 5.5x
-groupua="^MSIE 5\.",Internet Explorer 5.x
-groupua="^MSIE 4\.",Internet Explorer 4.x
-groupua="^MSIE 3\.",Internet Explorer 3.x
-groupua="^MSIE 2\.",Internet Explorer 2.x
-groupua="^Mozilla/2\.",Netscape 2.x
-groupua="^Mozilla/3\.",Netscape 3.x
-groupua="^Mozilla/4\.7",Netscape 4.7x
-groupua="^Mozilla/4\.",Netscape 4.x
-groupua="^Mozilla/5\.",Netscape 5.x
-groupua="^Netscape/4\.",Netscape 4.x
-groupua="^Konqueror/1\.",Konqueror 1.x
-groupua="^Lynx/2\.8\.",Lynx 2.8.x
-
-# url that should be counted as pages
-## pages that end with a '/' are index-pages
-pagetype="/$"
-## default page names
-pagetype="\.html$"
-pagetype="\.htm$"
-pagetype="\.php3$"
-#pagetype="\.asp$"
-#pagetype="\.shtml$"
-#pagetype="\.php$"
-
-# output modules (modlogan)
-[output_modlogan]
-
-# hostname (default: localhost)
-#hostname=##HOST##
-
-# number of lines per report
-#   0 - disabled
-#  >0 - number of lines per report
-maxrequrls	= 30
-maxrefurls	= 30
-maxos		= 50
-maxhosts	= 30
-maxentrypages	= 10
-maxexitpages	= 10
-maxindexedpages	= 20
-maxua		= 30
-maxreqprot	= 10
-maxreqmeth	= 10
-maxstatuscodes	= 10
-maxrobots	= 20
-maxbookmarks	= 20
-maxbrokenlinks	= 20
-maxsearchengines= 20
-maxsearchstrings= 30
-maxinteralerrors= 20
-maxcountries	= 20
-
-# colors
-# the notation is #RRGGBB (HTML-color-tripple)
-
-background	= #c0c0c0
-shadow		= #808080
-pages		= #00c0ff
-files		= #0080ff
-visits		= #ffff00
-xfer		= #ff0000
-hosts		= #ff8000
-hits		= #00C030
-grouping	= #D0D0E0
-body		= #FFFFFF
-
-# the different colors of the country pie
-country_circle	= #0000FF
-country_circle	= #00FFFF
-country_circle	= #FF00FF
-country_circle	= #FFFFFF
-country_circle	= #80FF00
-country_circle	= #FFFF00
-country_circle	= #FF0000
-country_circle	= #8080FF
-
-# pagestyle
-## the modlogan output plugin supports different output styles
-## - seppage
-## - onepage
-## - (a mixture of both)
-pagestyle	= seppage
-
-showdailygraph	= 1
-showmonthlygraph= 1
-showhourlygraph = 1
-showcountrygraph= 1
-
-showvalidationlinks = 1
-
-# assumed protocol for the url completition
-## the requested file in the logfile is only the path in the 
-## documentroot of the server. for the report it is often 
-## neccesary the complete the path to a full url.
-## <assumedprotocol>://<hostname>/<path> is the completed path.
-##
-## if this option isn't set this feature is disabled
-assumedprotocol = http
-
-# filenames for the replacements of the html-header/footer
-## take a look at ./doc/plugin-options.txt for more information
-#htmlheader	= header.ihtml
-#htmlfooter	= footer.ihtml
-
-# output modules (webalizer)
-[output_webalizer]
-
-# hostname (default: localhost)
-#hostname=##HOST##
-
-# number of lines per report
-#   0 - disabled
-#  >0 - number of lines per report
-maxrequrls	= 30
-maxrefurls	= 30
-maxos		= 50
-maxhosts	= 30
-maxentrypages	= 10
-maxexitpages	= 10
-maxindexedpages	= 20
-maxua		= 30
-maxreqprot	= 10
-maxreqmeth	= 10
-maxstatuscodes	= 10
-maxrobots	= 20
-maxbookmarks	= 20
-maxbrokenlinks	= 20
-maxsearchengines= 20
-maxsearchstrings= 30
-maxinteralerrors= 20
-maxcountries	= 20
-
-# colors
-# the notation is #RRGGBB (HTML-color-tripple)
-
-background	= #c0c0c0
-shadow		= #808080
-pages		= #00c0ff
-files		= #0080ff
-visits		= #ffff00
-xfer		= #ff0000
-hosts		= #ff8000
-hits		= #00C030
-grouping	= #D0D0E0
-body		= #FFFFFF
-
-# output modules (text)
-[output_text]
-
-# hostname (default: localhost)
-#hostname=##HOST##
-
-# number of lines per report
-#   0 - disabled
-#  >0 - number of lines per report
-maxrequrls	= 30
-maxrefurls	= 30
-maxos		= 50
-maxhosts	= 30
-maxentrypages	= 10
-maxexitpages	= 10
-maxindexedpages	= 20
-maxua		= 30
-maxreqprot	= 10
-maxreqmeth	= 10
-maxstatuscodes	= 10
-maxrobots	= 20
-maxbookmarks	= 20
-maxbrokenlinks	= 20
-maxsearchengines= 20
-maxsearchstrings= 30
-maxinteralerrors= 20
-maxcountries	= 20
-
-# output modules (tkcontrol)
-[output_tkcontrol]
-
-# hostname (default: localhost)
-#hostname=##HOST##
-
-maxcallednumbers	= 20
-maxcallingnumbers	= 20
-
-background	= #c0c0c0
-shadow		= #808080
-outgoing	= #00c0ff
-incomming	= #00C030
-grouping	= #D0D0E0
-body		= #FFFFFF
-calls		= #00ffff
-
-# input modules (clf)
-[input_clf]
-# filename of the input file
-## '-' for stdin or a uncompressed logfile
-inputfile=-
-
-# read ahead
-## multiple server can write into the same logfile which can lead to wrong
-## order of records in the logfile itself because noone can guarentee that 
-## two servers can access the logfile in the same order how they handled the
-## requests
-##   to get to correct results these records have to be re-sorted. the
-## readaheadlimit tells the parser what the longest distance of two
-## non-sorted records is.
-## Example:
-## ... [01/May/2000:00:01:50 +0200] "GET ...
-## ... [01/May/2000:00:01:52 +0200] "GET ... <-+  1.
-## ... [01/May/2000:00:01:53 +0200] "GET ...   |  2.
-## ... [01/May/2000:00:01:51 +0200] "GET ... --+  3.
-## ... [01/May/2000:00:01:54 +0200] "GET ...
-##
-## -> readaheadlimit = 3 
-
-readaheadlimit=2
-
-# these strings are used to detect the operating system in the useragent
-# string
-matchos="^Win"
-matchos="^Linux"
-matchos="^FreeBSD"
-matchos="^Macintosh"
-matchos="^PPC"
-matchos="^AIX"
-matchos="^IRIX"
-matchos="^SunOS"
-matchos="^OSF1"
-matchos="^OpenBSD"
-matchos="^Mac_PowerPC"
-matchos="^Solaris"
-matchos="^OS/2"
-matchos="^HP-UX"
-matchos="^NetBSD"
-matchos="^BSD/OS"
-
-# these strings are used to detect the requerying useragent in the useragent
-# string
-matchua="^iCab"
-matchua="^MSIE"
-matchua="^StarOffice"
-matchua="^Lotus-Notes"
-matchua="^BorderManager"
-matchua="^Powermarks"
-matchua="^NetMind-Minder"
-matchua="^WebCapture"
-matchua="^Squid"
-matchua="^Mozilla"
-matchua="^Konqueror"
-
-# input modules (msiis)
-[input_msiis]
-# filename of the input file
-## '-' for stdin or a uncompressed logfile
-inputfile=-
-
-# these strings are used to detect the operating system in the useragent
-# string
-matchos="^Win"
-matchos="^Linux"
-matchos="^FreeBSD"
-matchos="^Macintosh"
-matchos="^PPC"
-matchos="^AIX"
-matchos="^IRIX"
-matchos="^SunOS"
-matchos="^OSF1"
-matchos="^OpenBSD"
-matchos="^Mac_PowerPC"
-matchos="^Solaris"
-matchos="^OS/2"
-matchos="^HP-UX"
-matchos="^NetBSD"
-matchos="^BSD/OS"
-
-# these strings are used to detect the requerying useragent in the useragent
-# string
-matchua="^iCab"
-matchua="^MSIE"
-matchua="^StarOffice"
-matchua="^Lotus-Notes"
-matchua="^BorderManager"
-matchua="^Powermarks"
-matchua="^NetMind-Minder"
-matchua="^WebCapture"
-matchua="^Squid"
-matchua="^Mozilla"
-matchua="^Konqueror"
-
-# input modules (wuftpd)
-[input_wuftpd]
-# filename of the input file
-## '-' for stdin or a uncompressed logfile
-inputfile=-
-
-[input_realserver]
-inputfile=-
-
-[input_squid]
-inputfile=-
diff --git a/app-admin/modlogan/metadata.xml b/app-admin/modlogan/metadata.xml
index 20ce219711a2..76b9f6f406d5 100644
--- a/app-admin/modlogan/metadata.xml
+++ b/app-admin/modlogan/metadata.xml
@@ -2,4 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>no-herd</herd>
+<maintainer><email>liquidx@gentoo.org</email></maintainer>
 </pkgmetadata>
diff --git a/app-admin/modlogan/modlogan-0.7.18.ebuild b/app-admin/modlogan/modlogan-0.7.18.ebuild
deleted file mode 100644
index a9b8d753e791..000000000000
--- a/app-admin/modlogan/modlogan-0.7.18.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.18.ebuild,v 1.16 2004/06/24 21:32:14 agriffis Exp $
-
-DESCRIPTION="Logfile Analyzer"
-HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
-SRC_URI="http://jan.kneschke.de/projects/modlogan/download/${P}.tar.gz
-	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="nls mysql"
-
-DEPEND="virtual/x11
-	dev-libs/libxml
-	dev-libs/libxml2
-	media-libs/jpeg
-	media-libs/libpng
-	=media-libs/freetype-1.3*
-	>=dev-libs/libpcre-3.2
-	>=net-libs/adns-1.0
-	mysql? ( >=dev-db/mysql-3.23.26 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	cd ${S}/../gd-1.8.1
-	export CFLAGS="$CFLAGS -I/usr/include/freetype"
-
-	./configure || die
-	make || die
-
-	cp .libs/libgd.so.0.0.0 libgd.so.0.0.0
-	ln -s libgd.so.0.0.0 libgd.so
-
-	local myconf
-	use mysql \
-		 && myconf="--with-mysql=/usr" \
-		 || myconf="--without-mysql"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	cd ${S}
-	econf \
-		--enable-plugins \
-		--sysconfdir=/etc/modlogan \
-		--libdir=/usr/lib/modlogan \
-		--with-gd=${WORKDIR}/gd-1.8.1/ \
-		--disable-check-dynamic \
-		${myconf} || die "econf failed"
-
-	make || die
-}
-
-src_install() {
-	cd ${S}/../gd-1.8.1
-	into /usr
-	dolib libgd.so.0.0.0
-
-	cd ${S}
-	einstall \
-		sysconfdir=${D}/etc/modlogan \
-		libdir=${D}/usr/lib/modlogan || die
-
-	insinto /etc/modlogan
-	newins ${FILESDIR}/sample.conf modlogan.conf.sample
-	newins ${FILESDIR}/sample.def.conf modlogan.def.conf.sample
-	doins doc/modlogan.searchengines
-	insinto /etc/httpd
-	newins ${FILESDIR}/modlogan.conf httpd.modlogan
-	dodir /home/httpd/modlogan
-	preplib /usr
-	dodoc AUTHORS ChangeLog README NEWS TODO
-	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
-	dohtml -r html
-}
-
-pkg_postinst() {
-	if [ ! -a ${ROOT}etc/modlogan/modlogan.conf ]
-	then
-		cd ${ROOT}/etc/modlogan
-		sed -e "s:##HOST##:${HOSTNAME}:g" \
-			-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
-		modlogan.conf.sample > modlogan.conf
-		rm modlogan.conf.sample
-	fi
-
-	if [ ! -a ${ROOT}etc/modlogan/modlogan.def.conf ]
-	then
-		cd ${ROOT}/etc/modlogan
-		sed -e "s:##HOST##:${HOSTNAME}:g" \
-			-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
-		modlogan.def.conf.sample > modlogan.def.conf
-		rm modlogan.def.conf.sample
-	fi
-}
diff --git a/app-admin/modlogan/modlogan-0.7.4-r1.ebuild b/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
deleted file mode 100644
index da3156af08b5..000000000000
--- a/app-admin/modlogan/modlogan-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.7.4-r1.ebuild,v 1.21 2004/06/24 21:32:14 agriffis Exp $
-
-DESCRIPTION="Logfile Analyzer"
-HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
-SRC_URI="http://www.kneschke.de/projekte/modlogan/download/${P}.tar.gz
-	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="nls mysql"
-
-DEPEND="virtual/x11
-	dev-libs/libxml
-	dev-libs/libxml2
-	media-libs/jpeg
-	media-libs/libpng
-	=media-libs/freetype-1.3*
-	>=dev-libs/libpcre-3.2
-	>=net-libs/adns-1.0
-	mysql? ( >=dev-db/mysql-3.23.26 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	cd ${S}/../gd-1.8.1
-	export CFLAGS="$CFLAGS -I/usr/include/freetype"
-
-	./configure || die
-	make || die
-
-	cp .libs/libgd.so.0.0.0 libgd.so.0.0.0
-	ln -s libgd.so.0.0.0 libgd.so
-
-	local myconf
-	use mysql \
-		 && myconf="--with-mysql=/usr" \
-		 || myconf="--without-mysql"
-
-	use nls || myconf="${myconf} --disable-nls"
-
-	cd ${S}
-	econf \
-		--enable-plugins \
-		--sysconfdir=/etc/modlogan \
-		--libdir=/usr/lib/modlogan \
-		--with-gd=${WORKDIR}/gd-1.8.1/ \
-		--disable-check-dynamic \
-		${myconf} || die
-
-	make || die
-}
-
-src_install() {
-	cd ${S}/../gd-1.8.1
-	into /usr
-	dolib libgd.so.0.0.0
-	cd ${S}
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		sysconfdir=${D}/etc/modlogan \
-		libdir=${D}/usr/lib/modlogan \
-		install || die
-
-	insinto /etc/modlogan
-	newins ${FILESDIR}/sample.conf modlogan.conf.sample
-	newins ${FILESDIR}/sample.def.conf modlogan.def.conf.sample
-	doins doc/modlogan.searchengines
-	insinto /etc/httpd
-	newins ${FILESDIR}/modlogan.conf httpd.modlogan
-	dodir /usr/local/httpd/modlogan
-	preplib /usr
-	dodoc AUTHORS ChangeLog README NEWS TODO
-	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
-	docinto html
-	dodoc doc/*.html
-}
-
-pkg_postinst() {
-
-	if [ ! -a ${ROOT}etc/modlogan/modlogan.conf ]
-	then
-		cd ${ROOT}/etc/modlogan
-		sed -e "s:##HOST##:${HOSTNAME}:g" \
-			-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
-		modlogan.conf.sample > modlogan.conf
-		rm modlogan.conf.sample
-	fi
-
-	if [ ! -a ${ROOT}etc/modlogan/modlogan.def.conf ]
-	then
-		cd ${ROOT}/etc/modlogan
-		sed -e "s:##HOST##:${HOSTNAME}:g" \
-			-e "s:##HOST2##:${HOSTNAME/./\\.}:g" \
-		modlogan.def.conf.sample > modlogan.def.conf
-		rm modlogan.def.conf.sample
-	fi
-
-}
diff --git a/app-admin/modlogan/modlogan-0.8.10.ebuild b/app-admin/modlogan/modlogan-0.8.13.ebuild
index f1c73256bcf9..69c8ec339241 100644
--- a/app-admin/modlogan/modlogan-0.8.10.ebuild
+++ b/app-admin/modlogan/modlogan-0.8.13.ebuild
@@ -1,78 +1,86 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.8.10.ebuild,v 1.8 2004/10/05 02:58:11 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/modlogan/modlogan-0.8.13.ebuild,v 1.1 2004/10/17 17:14:12 liquidx Exp $
+
+MY_FILESDIR="${FILESDIR}/${PV}"
+THEMES_VERSION="0.0.7"
 
 DESCRIPTION="Logfile Analyzer"
 HOMEPAGE="http://jan.kneschke.de/projects/modlogan/"
 SRC_URI="http://jan.kneschke.de/projects/modlogan/download/${P}.tar.gz
-	 http://www.kneschke.de/projekte/modlogan/download/gd-1.8.1.tar.gz"
+	 http://jan.kneschke.de/projects/modlogan/download/modlogan-themes-${THEMES_VERSION}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~alpha hppa ~amd64 ~ia64"
+KEYWORDS="~x86 ~ia64 ~amd64 ~ppc ~sparc ~alpha ~hppa"
 IUSE="nls mysql"
 
-DEPEND="virtual/x11
-	dev-libs/libxml
+RDEPEND="dev-libs/libxml
 	dev-libs/libxml2
 	media-libs/jpeg
 	media-libs/libpng
-	=media-libs/freetype-1.3*
+	>=media-libs/gd-2
 	>=dev-libs/libpcre-3.2
 	>=net-libs/adns-1.0
+	sys-libs/zlib
+	app-arch/bzip2
+	dev-lang/perl
+	X? ( virtual/x11 )
 	mysql? ( >=dev-db/mysql-3.23.26 )"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	cd ${S}/../gd-1.8.1
-	export CFLAGS="$CFLAGS -I/usr/include/freetype"
-
-	./configure || die
-	make || die
 
-	cp .libs/libgd.so.0.0.0 libgd.so.0.0.0
-	ln -s libgd.so.0.0.0 libgd.so
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
+src_compile() {
 	local myconf
+
 	use mysql \
-		 && myconf="--with-mysql=/usr" \
-		 || myconf="--without-mysql"
+		&& myconf="--with-mysql=/usr" \
+		|| myconf="--without-mysql"
 
 	use nls || myconf="${myconf} --disable-nls"
-
-	cd ${S}
+	
 	econf \
 		--enable-plugins \
-		--sysconfdir=/etc/modlogan \
+		--sysconfdir=/etc \
 		--libdir=/usr/lib/modlogan \
-		--with-gd=${WORKDIR}/gd-1.8.1/ \
 		--disable-check-dynamic \
 		${myconf} || die
-
-	make || die
+	
+	emake || die
 }
 
 src_install() {
-	cd ${S}/../gd-1.8.1
-	into /usr
-	dolib libgd.so.0.0.0
-
-	cd ${S}
 	einstall \
-		sysconfdir=${D}/etc/modlogan \
+		sysconfdir=${D}/etc \
 		libdir=${D}/usr/lib/modlogan || die
 
 	insinto /etc/modlogan
-	newins ${FILESDIR}/sample.conf modlogan.conf.sample
-	newins ${FILESDIR}/sample.def.conf modlogan.def.conf.sample
+
+	newins ${MY_FILESDIR}/sample.conf modlogan.conf.sample
+	newins ${MY_FILESDIR}/sample.def.conf modlogan.def.conf.sample
+
+	insinto /etc/modlogan
+	newins doc/modlogan.css-dist modlogan.css
+	doins doc/output.tmpl
 	doins doc/modlogan.searchengines
-	insinto /etc/httpd
-	newins ${FILESDIR}/modlogan.conf httpd.modlogan
-	dodir /home/httpd/modlogan
+### needs some fixing
+#	insinto /etc/httpd
+#	newins ${MY_FILESDIR}/modlogan.conf httpd.modlogan
+###
+	keepdir /var/www/localhost/htdocs/modlogan
 	preplib /usr
 	dodoc AUTHORS ChangeLog README NEWS TODO
-	dodoc doc/*.txt doc/*.conf doc/glosar doc/stats
+	dodoc doc/*.txt doc/*.conf doc/*-dist doc/glosar doc/stats
 	dohtml -r html
+
+	# install themes
+	cd ${S}/../modlogan-themes-${THEMES_VERSION}
+	dodir /usr/share/modlogan/themes
+	for i in `ls -1`; do
+		einfo "installing theme $i"
+		cp -Rf $i ${D}/usr/share/modlogan/themes/
+	done
 }
 
 pkg_postinst() {