Changed the documentation directory from formerly /usr/doc to now /usr/share/doc.

2 files changed, 29 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b5efdd8e1d0a..291b25cd52ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Thu Jan 28 11:31:54 UTC 2016
 pkgbase = wwwoffle
 	pkgdesc = Simple caching proxy server with special features for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd.
 	pkgver = 2.9i
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.gedanken.org.uk/software/wwwoffle/
 	install = wwwoffle.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 0336b026341d..d3f5ca401dc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,17 @@
 
 pkgname=wwwoffle
 pkgver=2.9i
-pkgrel=4
+pkgrel=5
 pkgdesc="Simple caching proxy server with special features for use with dial-up internet links. Includes startup scripts for OpenRC, System V init, systemd."
 arch=('i686' 'x86_64' 'arm' 'arm64')
 url="http://www.gedanken.org.uk/software/wwwoffle/"
 license=('GPL')
 depends=('zlib' 'gnutls' 'libgcrypt')
 provides=(
-          "wwwoffle-sysvinit=${pkgver}"
-          "wwwoffle-openrc=${pkgver}"
-          "wwwoffle-systemd=${pkgver}"
-         )
+  "wwwoffle-sysvinit=${pkgver}"
+  "wwwoffle-openrc=${pkgver}"
+  "wwwoffle-systemd=${pkgver}"
+)
 backup=('etc/wwwoffle/wwwoffle.conf')
 install="${pkgname}.install"
 source=(
@@ -26,12 +26,14 @@ source=(
   "${install}"
 )
 
-sha256sums=('e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae'
-            'cd05738f73b109dd074f6dd919300eeae55c2aa812a15e0ae61b32622423c867'
-            '0d5bfcd1e348f6bdad042f780b2ea8a235314d5750a66ae008a0ea391bc5cc11'
-            '04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869'
-            '47f3df8ed05888452c00f8246f97456a4c55499b67e59c40da272b0e7fb1f2df'
-            '87eb11ad6e43eb9ac866806e413b187196d2d3b9383de76139d4e4ff71ffe855')
+sha256sums=(
+  'e6341a4ec2631dc22fd5209c7e5ffe628a5832ad191d444c56aebc3837eed2ae'
+  'cd05738f73b109dd074f6dd919300eeae55c2aa812a15e0ae61b32622423c867'
+  '0d5bfcd1e348f6bdad042f780b2ea8a235314d5750a66ae008a0ea391bc5cc11'
+  '04fd88f2a100e3ff9a96da6a70e58457252722cbf6350ffdbf08f17e62b64869'
+  '47f3df8ed05888452c00f8246f97456a4c55499b67e59c40da272b0e7fb1f2df'
+  '87eb11ad6e43eb9ac866806e413b187196d2d3b9383de76139d4e4ff71ffe855'
+)
 
 build() {
   _unpackeddir="${srcdir}/${pkgname}-${pkgver}"
@@ -39,6 +41,7 @@ build() {
   
   ./configure \
     --prefix=/usr \
+    --exec-prefix=/usr \
     --with-zlib=/usr/include \
     --with-gnutls=/usr/include/gnutls \
     --with-gcrypt=/usr/include \
@@ -46,6 +49,7 @@ build() {
     --with-spooldir=/var/spool/wwwoffle \
     --with-confdir=/etc/wwwoffle \
     --with-default-language=en \
+    --bindir=/usr/bin \
     --sbindir=/usr/bin
   
   make || return 1
@@ -53,14 +57,24 @@ build() {
 
 package() {
   _unpackeddir="${srcdir}/${pkgname}-${pkgver}"
-  cd "${_unpackeddir}"/etc/init.d/wwwoffle
+  cd "${_unpackeddir}"
   
+  # Install the software.
   make DESTDIR="${pkgdir}" install
+  
+  # Move documentation into the place we want it.
+  mkdir -p "${pkgdir}/usr/share"
+  mv -v "${pkgdir}/usr/doc" "${pkgdir}/usr/share/doc"
 
+  # Install startup scripts for different init systems.
   install -D -m755 "${srcdir}/initscript_sysvinit" "${pkgdir}/etc/rc.d/wwwoffle"
   install -D -m755 "${srcdir}/initscript_openrc" "${pkgdir}/etc/init.d/wwwoffle"
   install -D -m644 "${srcdir}/initscript_systemd" "${pkgdir}/usr/lib/systemd/system/wwwoffle.service"
+  
+  # Install a default configuration file.
   install -D -m644 "${srcdir}/conf_d_wwwoffle" "${pkgdir}/etc/conf.d/wwwoffle"
+
+  # Change config such that wwwoffle runs as user wwwoffle and group wwwoffle. (Adding user and group is handled by the ${install}-script.)
   sed -i -e 's/^#run-uid.*/ run-uid           = wwwoffle/' \
     "${pkgdir}/etc/wwwoffle/wwwoffle.conf"
   sed -i -e 's/^#run-gid.*/ run-gid           = wwwoffle/' \