From 877e6123011f073b760654c6d942197fe8c9f944 Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Mon, 20 Jan 2020 15:35:24 +0000
Subject: [PATCH] thttpd: corrected mandir

---
 thttpd/.footprint | 17 +++++++++--------
 thttpd/.signature |  6 +++---
 thttpd/Pkgfile    | 19 +++++++++----------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/thttpd/.footprint b/thttpd/.footprint
index 0fa728dec..0cb8dad38 100644
--- a/thttpd/.footprint
+++ b/thttpd/.footprint
@@ -5,17 +5,18 @@ drwxr-xr-x	root/root	etc/rc.d/
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/htpasswd
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rwxr-xr-x	root/root	usr/man/man1/htpasswd.1.gz
-drwxr-xr-x	root/root	usr/man/man8/
--rwxr-xr-x	root/root	usr/man/man8/redirect.8.gz
--rwxr-xr-x	root/root	usr/man/man8/ssi.8.gz
--rwxr-xr-x	root/root	usr/man/man8/syslogtocern.8.gz
--rw-r--r--	root/root	usr/man/man8/thttpd.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/syslogtocern
 -rwxr-xr-x	root/root	usr/sbin/thttpd
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rwxr-xr-x	root/root	usr/share/man/man1/htpasswd.1.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rwxr-xr-x	root/root	usr/share/man/man8/redirect.8.gz
+-rwxr-xr-x	root/root	usr/share/man/man8/ssi.8.gz
+-rwxr-xr-x	root/root	usr/share/man/man8/syslogtocern.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/thttpd.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 -rw-r--r--	root/root	var/log/thttpd.log (EMPTY)
diff --git a/thttpd/.signature b/thttpd/.signature
index c17902a4a..0c296755d 100644
--- a/thttpd/.signature
+++ b/thttpd/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3xbYWkOmCIkNfrWv+7V8cnT1eqYU4NcmNNvIQMbhAY0iQoBaOg+duI5gfmDr1xghJFf4x5gItH0EqT8M2aB7xgA=
-SHA256 (Pkgfile) = cadf72128e5f4e9627c8818268c03d4ce9bdd24533c0ab50ad53df92982c5c7c
-SHA256 (.footprint) = 066a97259a5465f42a6748ef30fc2c0af2241c472979785c83aaa16f6dcd3779
+RWSagIOpLGJF3z7EQr+hWQ+k8lw/K51nCrV8/y4xIYFmyOEJh7agV7e67pF7zMOwpNhvIqmMkAjN60yEwa+3bm0mDpSCpRfyGww=
+SHA256 (Pkgfile) = 0b9ca9cacf69c371cd648c9129bc66a9c8b6057c2adcd8b2741c741481a02b70
+SHA256 (.footprint) = aadec6312dcc00592b3a5d59e29eabfd8e89feee745aec8ba93fc3ced75e79c7
 SHA256 (thttpd-2.29.tar.gz) = 99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397
 SHA256 (thttpd.rc) = e8001e63e6d2400a12f81bc240d0bae4116772e571c712d121141ee2c990afbe
 SHA256 (thttpd.conf) = 540b98cdc0af4ec60d690a0101c29e67403a4ce5d4e5970a6c1d929ccb295a6b
diff --git a/thttpd/Pkgfile b/thttpd/Pkgfile
index 45eb37402..4e328da08 100644
--- a/thttpd/Pkgfile
+++ b/thttpd/Pkgfile
@@ -1,13 +1,12 @@
 # Description: Tiny/Turbo/Throttling HTTP Server.
 # URL:         http://www.acme.com/software/thttpd/thttpd.html
-# Packager:    James Mills, prologic at shortcircuit dot net dot au
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Depends on:   
+# Depends on:
 
 name=thttpd
 version=2.29
-release=1
-source=(http://www.acme.com/software/$name/$name-$version.tar.gz \
+release=2
+source=(https://www.acme.com/software/$name/$name-$version.tar.gz \
    thttpd.rc thttpd.conf config.h.patch)
 
 build() {
@@ -18,28 +17,28 @@ build() {
    make
 
    install -d $PKG/{var/log,var/www/{cgi-bin,users}}
-   
+
    install -D -m755 thttpd $PKG/usr/sbin/thttpd
-   install -D -m644 thttpd.8 $PKG/usr/man/man8/thttpd.8
+   install -D -m644 thttpd.8 $PKG/usr/share/man/man8/thttpd.8
    install -D -m755 ../thttpd.rc $PKG/etc/rc.d/thttpd
    install -D -m644 ../thttpd.conf $PKG/etc/thttpd.conf
 
    # Install 'extras'
    install -D -m755 extras/htpasswd $PKG/usr/bin/htpasswd
-   install -D -m755 extras/htpasswd.1 $PKG/usr/man/man1/htpasswd.1
+   install -D -m755 extras/htpasswd.1 $PKG/usr/share/man/man1/htpasswd.1
 
    install -D -m755 extras/syslogtocern $PKG/usr/sbin/syslogtocern
-   install -D -m755 extras/syslogtocern.8 $PKG/usr/man/man8/syslogtocern.8
+   install -D -m755 extras/syslogtocern.8 $PKG/usr/share/man/man8/syslogtocern.8
 
    # Install CGI
    install -D -m755 cgi-src/phf $PKG/var/www/cgi-bin/phf
    install -D -m755 cgi-bin/printenv $PKG/var/www/cgi-bin/printenv
 
    install -D -m755 cgi-src/redirect $PKG/var/www/cgi-bin/redirect
-   install -D -m755 cgi-src/redirect.8 $PKG/usr/man/man8/redirect.8
+   install -D -m755 cgi-src/redirect.8 $PKG/usr/share/man/man8/redirect.8
 
    install -D -m755 cgi-src/ssi $PKG/var/www/cgi-bin/ssi
-   install -D -m755 cgi-src/ssi.8 $PKG/usr/man/man8/ssi.8
+   install -D -m755 cgi-src/ssi.8 $PKG/usr/share/man/man8/ssi.8
 
    chmod 755 $PKG/var/www
    chmod 1777 $PKG/var/www/users