diff --git a/www/awstats/MESSAGE b/www/awstats/MESSAGE
deleted file mode 100644
index dd0d1f6fcdab..000000000000
--- a/www/awstats/MESSAGE
+++ /dev/null
@@ -1,15 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.6 2006/05/16 18:13:55 minskim Exp $
-
-An example file has been installed as
-${PREFIX}/share/examples/awstats/awstats.conf. After adjusting it to
-your needs, copy it to ${PREFIX}/awstats/cgi-bin/awstats.conf.
-
-Alternatively, you can also now use ${PKG_SYSCONFDIR} to store your awstats
-configuration files.
-
-You may need to adjust the cgi-bin path of your webserver -- for details,
-refer to the documentation in
- ${PREFIX}/share/doc/awstats
-
-===========================================================================
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 84295f6c23a6..3b8d1258910e 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2022/06/28 11:37:02 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2024/06/05 20:27:46 hauke Exp $
-DISTNAME= awstats-7.7
-PKGREVISION= 4
+DISTNAME= awstats-7.9
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=awstats/}
@@ -23,9 +22,6 @@ REPLACE_PERL+= wwwroot/classes/src/*.pl
.include "../../mk/bsd.prefs.mk"
-APACHE_USER?= www
-APACHE_GROUP?= www
-
PKG_GROUPS_VARS+= APACHE_GROUP
PKG_USERS_VARS= APACHE_USER
BUILD_DEFS+= VARBASE
@@ -44,6 +40,7 @@ SUBST_FILES.conf= tools/awstats_configure.pl \
SUBST_VARS.conf= PREFIX
SUBST_VARS.conf+= VARBASE
SUBST_VARS.conf+= PKG_SYSCONFDIR
+SUBST_VARS.conf+= PKG_SYSCONFBASE
SUBST_SED.conf+= -e "s|\"/etc/awstats|\"${PKG_SYSCONFDIR}|g"
SUBST_SED.conf+= -e "s|\"/usr/local/awstats/wwwroot|\"${PREFIX}/awstats|g"
SUBST_SED.conf+= -e "s|/var/log/httpd/mylog.log|${VARBASE}/log/httpd/access_log|g"
diff --git a/www/awstats/PLIST b/www/awstats/PLIST
index 8f411471b8a0..c8e610a7bf3c 100644
--- a/www/awstats/PLIST
+++ b/www/awstats/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2017/02/12 10:27:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2024/06/05 20:27:46 hauke Exp $
awstats/bin/awstats_buildstaticpages.pl
awstats/bin/awstats_configure.pl
awstats/bin/awstats_exportlib.pl
@@ -53,6 +53,7 @@ awstats/cgi-bin/lang/awstats-se.txt
awstats/cgi-bin/lang/awstats-si.txt
awstats/cgi-bin/lang/awstats-sk.txt
awstats/cgi-bin/lang/awstats-sr.txt
+awstats/cgi-bin/lang/awstats-tg.txt
awstats/cgi-bin/lang/awstats-th.txt
awstats/cgi-bin/lang/awstats-tr.txt
awstats/cgi-bin/lang/awstats-tw.txt
@@ -122,6 +123,8 @@ awstats/cgi-bin/plugins/clusterinfo.pm
awstats/cgi-bin/plugins/decodeutfkeys.pm
awstats/cgi-bin/plugins/export_to_csv.pm
awstats/cgi-bin/plugins/geoip.pm
+awstats/cgi-bin/plugins/geoip2_city.pm
+awstats/cgi-bin/plugins/geoip2_country.pm
awstats/cgi-bin/plugins/geoip6.pm
awstats/cgi-bin/plugins/geoip_asn_maxmind.pm
awstats/cgi-bin/plugins/geoip_city_maxmind.pm
@@ -432,6 +435,7 @@ awstats/icon/flags/ma.png
awstats/icon/flags/mc.png
awstats/icon/flags/md.png
awstats/icon/flags/me.png
+awstats/icon/flags/mf.png
awstats/icon/flags/mg.png
awstats/icon/flags/mil.png
awstats/icon/flags/mk.png
@@ -503,6 +507,7 @@ awstats/icon/flags/sr.png
awstats/icon/flags/st.png
awstats/icon/flags/su.png
awstats/icon/flags/sv.png
+awstats/icon/flags/sx.png
awstats/icon/flags/sy.png
awstats/icon/flags/sz.png
awstats/icon/flags/tc.png
@@ -593,6 +598,25 @@ awstats/icon/mime/xls.png
awstats/icon/mime/xsl.png
awstats/icon/os/aix.png
awstats/icon/os/amigaos.png
+awstats/icon/os/android.png
+awstats/icon/os/android10.png
+awstats/icon/os/android11.png
+awstats/icon/os/android12.png
+awstats/icon/os/android13.png
+awstats/icon/os/androidcupcake.png
+awstats/icon/os/androiddonut.png
+awstats/icon/os/androideclair.png
+awstats/icon/os/androidfroyo.png
+awstats/icon/os/androidgingerbread.png
+awstats/icon/os/androidhoneycomb.png
+awstats/icon/os/androidics.png
+awstats/icon/os/androidjellybean.png
+awstats/icon/os/androidkitkat.png
+awstats/icon/os/androidlollipop.png
+awstats/icon/os/androidmarshmallow.png
+awstats/icon/os/androidnougat.png
+awstats/icon/os/androidoreo.png
+awstats/icon/os/androidpie.png
awstats/icon/os/apple.png
awstats/icon/os/atari.png
awstats/icon/os/beos.png
@@ -612,6 +636,7 @@ awstats/icon/os/dos.png
awstats/icon/os/dreamcast.png
awstats/icon/os/freebsd.png
awstats/icon/os/gnu.png
+awstats/icon/os/haiku.png
awstats/icon/os/hpux.png
awstats/icon/os/ibm.png
awstats/icon/os/imode.png
@@ -640,10 +665,15 @@ awstats/icon/os/linuxvine.png
awstats/icon/os/linuxzenwalk.png
awstats/icon/os/mac.png
awstats/icon/os/macintosh.png
+awstats/icon/os/macos11.png
+awstats/icon/os/macos12.png
awstats/icon/os/macosx.png
awstats/icon/os/macosx10.png
awstats/icon/os/macosx11.png
awstats/icon/os/macosx12.png
+awstats/icon/os/macosx13.png
+awstats/icon/os/macosx14.png
+awstats/icon/os/macosx15.png
awstats/icon/os/macosx4.png
awstats/icon/os/macosx5.png
awstats/icon/os/macosx6.png
@@ -671,6 +701,7 @@ awstats/icon/os/webtv.png
awstats/icon/os/wii.png
awstats/icon/os/win.png
awstats/icon/os/win10.png
+awstats/icon/os/win11.png
awstats/icon/os/win16.png
awstats/icon/os/win2000.png
awstats/icon/os/win2003.png
diff --git a/www/awstats/distinfo b/www/awstats/distinfo
index 2c8c6ed36f6f..0bc44674a2a5 100644
--- a/www/awstats/distinfo
+++ b/www/awstats/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.40 2021/10/26 11:29:21 nia Exp $
+$NetBSD: distinfo,v 1.41 2024/06/05 20:27:46 hauke Exp $
-BLAKE2s (awstats-7.7.tar.gz) = 672eb29431d76ea6321ab43922ca6a19d53aabc11267f4c36a02ad9f583cf522
-SHA512 (awstats-7.7.tar.gz) = 8bf32b0650ef0cc900a16eead866da3847d81c2696e7a90fb49833679c958768833d781e5b4becd9b4f6748c7266e2887ff7ff33d98293ce3a0296a810fbe899
-Size (awstats-7.7.tar.gz) = 2956851 bytes
-SHA1 (patch-tools_awstats__configure.pl) = bb098d890e1ee6a0a354dd9036e57f6eb42d3945
+BLAKE2s (awstats-7.9.tar.gz) = 7b53759425440b42747ba57dc7747bdd93aa9e800aa0f167eda15b8386e8bdf8
+SHA512 (awstats-7.9.tar.gz) = 1270c7486a5558a54abc7b43cd92ffcea356ff4c00271bb824758ef4f5736eff559dd38eb7bc7bff8d45efa970a60ddcc5771762a3c3a32f003b0e39c55814d9
+Size (awstats-7.9.tar.gz) = 2948602 bytes
+SHA1 (patch-tools_awstats__configure.pl) = 71771b2b9450bd667d4f887abb5bba1c1635a879
SHA1 (patch-wwwroot_cgi-bin_awstats.pl) = edb1fa423ae1a0608e2226b55a8cded7c0c6292f
-SHA1 (patch-wwwroot_cgi-bin_lib_search__engines.pm) = 7f9a3c1d38b8ee47d41fcb72e3aa0c172cd9ac69
diff --git a/www/awstats/patches/patch-tools_awstats__configure.pl b/www/awstats/patches/patch-tools_awstats__configure.pl
index d0b3b4ad0005..dceec2252a8d 100644
--- a/www/awstats/patches/patch-tools_awstats__configure.pl
+++ b/www/awstats/patches/patch-tools_awstats__configure.pl
@@ -1,8 +1,8 @@
-$NetBSD: patch-tools_awstats__configure.pl,v 1.1 2020/01/07 18:21:02 adam Exp $
+$NetBSD: patch-tools_awstats__configure.pl,v 1.2 2024/06/05 20:27:46 hauke Exp $
Fix paths.
---- tools/awstats_configure.pl.orig 2016-08-27 18:59:01.000000000 +0000
+--- tools/awstats_configure.pl.orig 2019-06-27 09:30:40.000000000 +0000
+++ tools/awstats_configure.pl
@@ -28,12 +28,12 @@ $AWSTATS_MODEL_CONFIG
$AWSTATS_DIRDATA_PATH
@@ -27,7 +27,7 @@
'/etc/httpd/httpd.conf',
'/usr/local/apache/conf/httpd.conf',
'/usr/local/apache2/conf/httpd.conf',
-+'@PREFIX@/etc/httpd/httpd.conf',
++'@PKG_SYSCONFBASE@/httpd/httpd.conf',
);
use vars qw/
@@ -67,9 +67,9 @@
$AWSTATS_PATH=~s/tools[\\\/]?$//;
$AWSTATS_PATH=~s/[\\\/]$//;
- if ($AWSTATS_PATH ne '/Library/WebServer/awstats') {
-- print "Warning: AWStats standard directory on Mac OS X is '/Library/WebServer/awstats'.\n";
+- print "Warning: AWStats standard directory on macOS is '/Library/WebServer/awstats'.\n";
+ if ($AWSTATS_PATH ne '@PREFIX@/awstats') {
-+ print "Warning: AWStats standard directory on Mac OS X is '@PREFIX@/awstats'.\n";
++ print "Warning: AWStats standard directory on macOS is '@PREFIX@/awstats'.\n";
print "If you want to use standard directory, you should first move all content\n";
print "of AWStats distribution from current directory:\n";
print "$AWSTATS_PATH\n";
@@ -98,7 +98,7 @@
print "\n".($bidon?"Now, enter":"Enter")." full config file path of your Web server.\n";
print "Example: /etc/httpd/httpd.conf\n";
print "Example: /usr/local/apache2/conf/httpd.conf\n";
-+ print "Example: @PREFIX@/etc/httpd/httpd.conf\n";
++ print "Example: @PKG_SYSCONFBASE@/httpd/httpd.conf\n";
print "Example: c:\\Program files\\apache group\\apache\\conf\\httpd.conf\n";
$bidon='';
while ($bidon ne 'none' && ! -f "$bidon") {
diff --git a/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm b/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm
deleted file mode 100644
index 8afcea020abb..000000000000
--- a/www/awstats/patches/patch-wwwroot_cgi-bin_lib_search__engines.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-wwwroot_cgi-bin_lib_search__engines.pm,v 1.1 2020/01/07 18:21:02 adam Exp $
-
-Fix ampersand encoding that breaks XHTML output, ID 1824230.
-
---- wwwroot/cgi-bin/lib/search_engines.pm.orig 2017-02-20 23:35:50.000000000 +0000
-+++ wwwroot/cgi-bin/lib/search_engines.pm
-@@ -5084,7 +5084,7 @@
- 'atlanticbb','atlanticbb',
- 'atlas','Atlas.cz',
- 'atomz','Atomz',
--'att','AT&T search (powered by Google)',
-+'att','AT&T search (powered by Google)',
- 'auone','auone',
- 'avantfind','Avantfind',
- 'avg','avg',