Version bump.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 399 insertions, 4 deletions

diff --git a/sys-process/acct/ChangeLog b/sys-process/acct/ChangeLog
index ebaf57a935a3..7f79116e9cf1 100644
--- a/sys-process/acct/ChangeLog
+++ b/sys-process/acct/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/acct
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.76 2014/11/08 09:53:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/ChangeLog,v 1.77 2014/11/08 09:54:10 vapier Exp $
+
+*acct-6.6.2 (08 Nov 2014)
+
+  08 Nov 2014; Mike Frysinger <vapier@gentoo.org> +acct-6.6.2.ebuild,
+  +files/acct-6.6.2-cross-compile.patch:
+  Version bump.
 
   08 Nov 2014; Mike Frysinger <vapier@gentoo.org>
   files/acct-6.6.1-cross-compile.patch, files/acct-6.6.1-no-gets.patch:
diff --git a/sys-process/acct/Manifest b/sys-process/acct/Manifest
index 756209d2b7ed..968e855b6a08 100644
--- a/sys-process/acct/Manifest
+++ b/sys-process/acct/Manifest
@@ -1,18 +1,41 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX acct-6.5.5-cross-compile.patch 8335 SHA256 368cd7d9598c1c63a082b8aa40989b4701fc04b97ccea136ebcc66ab8b0f0e83 SHA512 c30d71f7ef83ec1aea66bebe40eafcce55047b34f26e929ae1a93279c2371a69fca0934eaf3e1e915e451b2ec2d9ab97eab94d1dfe28e18532747d1815030e91 WHIRLPOOL 0e14c899a7d13f2b23e12229f7ef97280d6e9ce52848045bd00558d2738e4f271f6536bbab675ebee0dfa742d540ac86591d7906d3d3e2e3d1a1c0ed7b5d1b2e
 AUX acct-6.5.5-no-gets.patch 779 SHA256 0aa8aac492b2a380c9661362d3731c9827516052c008881182b01b3ca302eece SHA512 adefec843a1339ff1f14c71b2164f1fc77d5f17f053a6da45dfe74851891e89b4a90dda8ef8405b277c9e5f08c18eb6767aae6cc069566526127cd93eba3fd4e WHIRLPOOL 3d7a15bdaaed005c97d9934f09e94594e0e796bb3b4736502e6a77401c8423949d8c1d2caf5e594f2d0c6299d3b032a4c1b025710cb064cf37216707c30d5850
-AUX acct-6.6.1-cross-compile.patch 8526 SHA256 0cccd5f1e284c3d5690cb3c0a7865d0ab9a24d46ffc5672ef0147d37132424a8 SHA512 b32ea89c0b57e00aaeab7e37896cd26b569433cdb884abd7d5f20e24d7a5fe1044d548d09a7987f83c900b553fb6c60dbeb0f7bde319e487b67d99de6bc4023d WHIRLPOOL ada52269d01cecb667622f260c0ea2d13ab07757bd1bb9074de6723fced47fb3ade4eae35d274808cef780562be7b4c554c5de5b4e5de6cd4054686ceacb1194
+AUX acct-6.6.1-cross-compile.patch 8519 SHA256 1dfc10e4756657233d4f289e82ef5b9dc8928e75d5425847ae94eb8072455793 SHA512 292a8cf149961c56dd70cdf7a119ae58e563bb42c06873720bd5e0050a88d7d661159d495b0e9171ba2dfe2d96ebbc042144f10a05f6910fd51b767455f33912 WHIRLPOOL b17b622f5a2f2bde8cd25229b26b9f3c33dacd41f9bd731fbf1192bf7fadb842df907f43a949c88bb896c2ec50d3421624bc893824b5fd2bbc9ad1b10619b63e
 AUX acct-6.6.1-math.patch 811 SHA256 5b606fed230e5e9370958187ce34e8a723a8e7b850ed9ea98dc94e6c232f5789 SHA512 68ce8785bbe36600a9768a7e249c0de992b5d46a32924b79499dd97e6e6382d74f235cdb1d083b97aee39017bb0f43cc6e574d169e01b5608f0cbc850fa68803 WHIRLPOOL 78cb77bd25bb28827eb9cec9e96c5f80e1f2557a538e5bda6036939cedef1879b3a6ebf6077379b2e39a09e15caf7531fe09f479e647613302859ef0294492a9
-AUX acct-6.6.1-no-gets.patch 516 SHA256 b8984f964e89dbdc266a319c5514224137a81b92a1b28d795883d4e6be39e629 SHA512 f3b612e4f67eb77d993559bdc8522e74a80d70ff110cc67dabe12280ecf2bcedfa449359cc9de432fd979c9e38457393809fad666f0ab32ede93dc47983a77ac WHIRLPOOL 71d04cb35646479448aa7697777df6e15a1a0882511d7b5de0bc2ca98e6d0829e5b9a639d78295083065eefe06a1cbf2bf1bb760d2e517ca760ce12946a0c944
+AUX acct-6.6.1-no-gets.patch 834 SHA256 11c09905818c172ac312b32daaf4991846424db6b924df9cda8c37dae979b36a SHA512 2c3b98c798b751a739a3a48346f4749b6173eb65ce88f578cda67a101ac6342e8a7b9478bab755d60dcd13552928c4976c94d45e2c69ef3980cd6552f0c0b8d7 WHIRLPOOL d15e4004afe887824fec3c14200e81d454eacb648993268f247e568d8808fb5339e604d9c83d4cd1c22806a17cab04418cd499c3e99bbc52c18ca3598fac28d5
 AUX acct-6.6.1-texi-failure.patch 1122 SHA256 2f6d044706014d9571ed0de4b1a10c48164a0f2e1280b85beba0c11a3b7d322f SHA512 de33f73389220b440f484c96ec9ec323a640e420d4659bc09dd8b79da366a11d29631abec2be40f0a8d2b4579435b44a54f8f7f61eff8f785c1c28491213d8e3 WHIRLPOOL 574f0409ce70fab4d83dfde69b33d6255778a872e0613461918b97dd90c68f5830d8201c44b6d25e6322825e98f306369b14be6fa574a672c57e02ac13ed9c26
+AUX acct-6.6.2-cross-compile.patch 8540 SHA256 ad59ba4cb3c69445785a366944b30549a9441b716764b5a1c44f083b43217174 SHA512 3afeac0d0271944da5b2e6c9efe487db979025fbbd563a3e088fbdde76296efa4a6de52660bca0690e3c921d62b8c8b9864f689d1cb1dcbcf52a396eaea931f2 WHIRLPOOL 267cd223e4a52cc6d4c852cd5e229e1a68693455f6137d92bdc217f8320e4f2127b55e17fa728fe25a4426f5c36ed92f812c3aaacfb6f1535444af8e3b2708ea
 AUX acct.confd 389 SHA256 03dec915e2f80746a5147f3a6ff34a5ce8d3dc4b0007a318a29c5f9ca91cdb31 SHA512 1d193d675f38ce8360251939ff0fdf89c1ba04244b2f2ee19a4180f180aa464447027dcd532cc044e9da7651c050c42e8bfe6ee350d29be3510395e44790c150 WHIRLPOOL 6298c8a8a8a64774d6fd5543e397c0b1e1f86dc20d440d34a9c6bc23cfd9ab55e59e569a75d2425c4b76d1cf5b407438a00e86057d19a317e4af150ec9617013
 AUX acct.initd 693 SHA256 5ba55e2ec0339e5c5a99351c89eb58414a7ce8d04409208f62db772b9b624d25 SHA512 ae1014f7fd38d1fd954fecc765bb765f4e2ec25eb515b30c581b255e233423f3fefae6e1eb32cbfbfa1006020f94a1ff8325b56968bee7442452856fd0e8723e WHIRLPOOL 8c19dc6319fc52de52e2c0061b4a43f254f469c9d4cb699b80a8745ef6964167378935b6533f39b2f585f863ab2d5d601caaa24c6978932ba9dcd5fcb56ddbe1
 AUX acct.logrotate 209 SHA256 e3f70c702dd95dc2309688354c08136fad83fdfc28789d6ea5b5ccbe1ea1512f SHA512 a91ac927ce536827eea6c4ce5c454df831d61120ff453582c4e2fa186b1e8ea52792ed529c242e58ce8a575ac5d26bc1a97670880fb51e8c08598d54894fb90e WHIRLPOOL 4a6330ccb4882d30e80c45f22253cdad4658e2f33f3a54aea4745171f1e1ecb9911116c86a5eaaeadfc062584d96eeb8bbee81556f6014cc75b3ff2d807a0b12
 AUX acct.service 382 SHA256 468040c3fc5be494ba0f84492048c03b6c5919a24549cb94bd42da30a4483743 SHA512 8c2523526eb3185765eac62676761af6758d0090d68ba48aeacc59c7a45f0722c867fb97d02ff3ceaa8d77637d2b915938d545f7d782e4f7aa46861f25364bd3 WHIRLPOOL df650e7d412d95b1f3253ac1b90f6fa9f7e31d9aef514a3d5f400db57ac55358c0343cbc9810b42de61e5e1b783a615afa8768e0216b1add2fd07ceac79f5826
 DIST acct-6.5.5.tar.gz 747225 SHA256 4163c87b9e92a73a65eaeadc6c41caa4626da782ff26d6e7a945edcc140a6fd5 SHA512 6a36548cfe0e68829c94780aac4053f8a5840c5a704b88a9562758408dc64b4e26965743aec51ef02f7780efcfbf42d20805fecb12a68e7e1f279a1259151fb0 WHIRLPOOL 30c431dfe3af181770e261470090528fd21d41b45a234181ef0f1a62226979d4de38f851b1d5e200feba5b08acf30d2fe18a517f6096f3fcbc8e32dca9630be4
 DIST acct-6.6.1.tar.gz 2869677 SHA256 554515611ef9299012b7510050868a48fc178ce1544947123ab46ec50230ffcb SHA512 4bc3d6b41aeafcf8acfdd020057f1b6f15eea3589981387bca7e57aa8fe71d058e8def97f139dd2c11a1ac39f2d8b95bd103d31caff042cf716dd961b9588f5d WHIRLPOOL 097b7c5f55aac40dd5d63b6ce80a1c2809241f3999c15d5c2c3d8f418f1e51b90ed3c5937655dafd9d702fc72b1d1a6faae870e0c2722c3716e097d5d3b98cd1
+DIST acct-6.6.2.tar.gz 852375 SHA256 8ed47b2f893b08f0d67720880adbb48b835a826c314fa52fd52af1cee6870101 SHA512 5942aa3d1faebb29bd6d6ff97c2ba8525dc5a9c85522c3f549ce0772042d3736e19126ddd7e10fe0681a6ac496b8d3aafda0894577a3b64c59f3b78fc222d2b3 WHIRLPOOL 135be28fb3b99ae5c4fb03d21d73a2bb2659d4e209a1444bb4741ae95761191ac74874f0476d3413c4221e2b321de2adf45240b2335b5cac92083d32ab547ebe
 EBUILD acct-6.5.5-r1.ebuild 1025 SHA256 a0a9fd9d6584a97d7ab86885f41eee84b1d929c869d372748ea98b49d8b6c839 SHA512 8b36714d3aa4e340fe4a9d3929a4ddb3bec0595c559faee97e19ad467f0371e78a1a538ef39a2eaff8105b85457c8f586fabc3a5fbb5459b6e2df402ade00754 WHIRLPOOL 1c993f25eca7350a62656ef222c5823fbadc1fa9d936272de96137f848c07811cb72e255da611d2846ae285320eac5fb624e14c94ab1caf35f446d13c3f64330
 EBUILD acct-6.5.5-r2.ebuild 1232 SHA256 21d07cf36787ef360abe8d236130425228f17381a9c48a3aeb56adcf592d0806 SHA512 9ab7d19dfd4be42bcc887149f9262fbbf1955b2449ad4176a1fc73d750cf3a0503b61b97f10bc04150de17492cf167695e3d2f645ea4742bc8f3c7af42dc30a3 WHIRLPOOL ea2701d5f61e8dd0ef31d4f9b5fdf2533258ee743caa65a529155f08f318fab3396296131dbaddb78cca7238e3c2eaa5eca8facc81ccc03de4465c05c9c9cf9a
 EBUILD acct-6.5.5-r3.ebuild 1276 SHA256 ef3bc17f77e2a20c82f04c754e463f64c5d986c72d286df29ea63da0425617ef SHA512 730971139d70661bfa92857ae061734a49fa0556478d80dccbf3a1d0d6d118006f3819bbde82eef3692e69c1a3cfbb401e430bdac6bc8b9d9932f5946babcd9a WHIRLPOOL 403901504bad0a337cefa778ad97de8da72fce9dd13b3f4e80293fc20780a4ac8504e4b9847e57a2b74d5303a30f00ec0401ec6c6923dc48ec05f1c0ebe8a7ed
 EBUILD acct-6.6.1.ebuild 1324 SHA256 1f08a28ec24353a62934b502feab88338ff796047850a5dc328c9ed922573e5d SHA512 5c99bdd05093da6a4d93a1685598d08d9ccdad998348dfb8cf04e215bc7f41bc90dc8c19bec5818ca19b826245be4d56e91aa13ac8f152fe20ec60314cd249db WHIRLPOOL 68432678c89f59756682f296f199cffdc385ee359709b4f243a17b292ec0ba67b3fc6d6c59ba51c855a6bfa24b65f3a00c2de52b23f2144376613d49cdc46f1d
-MISC ChangeLog 10799 SHA256 d8a1f0f15cec1150360c20bb7e4bf2bd6c4d697fe71f98d142b6101fda8d8ac6 SHA512 e47cbc3a6fdf7e8fc50c7eac57332b429ec51b44efdde853df7779fec1631ed970947645d3787bf5eae9055da267bcff5b914793d77e587ff5283a922d488f86 WHIRLPOOL bc6c4e638f8213c076967088f4e4b131c900f6d2985509e142c78736f376340f3716dddd07fdf0afd6d582753ebd655899fbb3ff70218e310d9cecb756ddeacb
+EBUILD acct-6.6.2.ebuild 1197 SHA256 cfa217a355b0e11dd4b7b51a5d57e0c648a202a5a2f03afff5f2744a92d3c886 SHA512 b26d36e88679052971edd7fa0f854ad32fa1ea5156d149f0dd0d7d672a18578f43937f08d48337b33ca144eb978a3b8e29c401d0c794b181e18621564802f0de WHIRLPOOL c4c1b163f7032171e450b607912bc2ccb9417d090f0844ee8140216c1e19d58d5446ce0d7e1e19ea8589411a4dc239d492ccaaff7a48802b251738ba423daf38
+MISC ChangeLog 11120 SHA256 3eb4a223ccfd330881c8bfff1063c2360f276e771b1d5442e5f343cb8fe53874 SHA512 435429c8fdfe2ebfa261e2eba9d779162a317310ef430e97d49c17814bb6d5fd3effce657737fa1386622816a29d51b5cced3f6223e7e5cdd64677b0f653d0f2 WHIRLPOOL 32b4d4f851d8c3e177d4698b364b8bde0218ed243dbb2b82f06055a6c32ba330e1e86e656b19ca4d7a27fdf33b1bd218abc54018f4ebef6d6770f965ba3fc507
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJUXehrAAoJEPGu1DbS6WIAUpkP/059W9pHy1Pcel64gH+AVbqF
+cViVVcxTLFqq6dABpQgfxOO3Q8myINKT7VLY0QyTk2OlhlfA7V9jeg8jLa1YO1TJ
+tBPl6eOo8HSPBKaiK4YXPdeCuMkn8FIIB32p+0aNxLj/Z1fg1QHkZnjdaTdHfufQ
+UF0d7qANtO5+AjTb84AVFSiY59/vQbPQKHls4T/OJm+Ii2eOK+zhtgg8qfF3taIf
+bduH9kfb/AMVqu3aLl5vZsIODDlPRUwhSSfsPWf3caGPmGjQpJVxC+mmNvMpnoQd
+lsmf5TYbocG3jwbpNSdmDLrjT6RbIu/Ru8IbGH5YHJDTp9jbcbMIzgKq1Eb+b4la
+hBDuKQLBQwr6aa1sKY36inPRaAwB900yNyBFVKv0WbYHCi7yj46k+GBBdyaRLDxr
+wo/Yq2CcH5XjNXiRocGU0HdqaUtXLOhSw4F+ilqGyYliZ/bNfS04KLMs8e7GeZOV
+x+Pzj11fAjvH9C24LV2bZPoEspTb/0VNJs07k8j68IFa6a0yvziOJ4xj7olAFNDq
+xWnqn/p3U+cMAlz0w/47zosbHAl2aH9Lkpr2G0LQIk5AKF5BpwjdYt1t8ns87o02
+a6vNBiU2iOwA2niry7t35Yxp5K+9wZCtUCnGnmZ0qO8Afn64ZVd9xAAlmdnfQWGc
+KckDzF2YcKMljL7CXlb2
+=vUV3
+-----END PGP SIGNATURE-----
diff --git a/sys-process/acct/acct-6.6.2.ebuild b/sys-process/acct/acct-6.6.2.ebuild
new file mode 100644
index 000000000000..72add5d314e0
--- /dev/null
+++ b/sys-process/acct/acct-6.6.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/acct/acct-6.6.2.ebuild,v 1.1 2014/11/08 09:54:10 vapier Exp $
+
+EAPI=5
+inherit autotools base systemd
+
+DESCRIPTION="GNU system accounting utilities"
+HOMEPAGE="https://savannah.gnu.org/projects/acct/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.6.2-cross-compile.patch
+	"${FILESDIR}"/${PN}-6.6.1-no-gets.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-linux-multiformat
+}
+
+src_install() {
+	default
+	keepdir /var/account
+	newinitd "${FILESDIR}"/acct.initd acct
+	newconfd "${FILESDIR}"/acct.confd acct
+	systemd_dounit "${FILESDIR}"/acct.service
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/acct.logrotate acct
+
+	# sys-apps/sysvinit already provides this
+	rm "${ED}"/usr/bin/last "${ED}"/usr/share/man/man1/last.1 || die
+
+	# accton in / is only a temp workaround for #239748
+	dodir /sbin
+	mv "${ED}"/usr/sbin/accton "${ED}"/sbin/ || die
+}
diff --git a/sys-process/acct/files/acct-6.6.2-cross-compile.patch b/sys-process/acct/files/acct-6.6.2-cross-compile.patch
new file mode 100644
index 000000000000..70b0556fd486
--- /dev/null
+++ b/sys-process/acct/files/acct-6.6.2-cross-compile.patch
@@ -0,0 +1,320 @@
+https://savannah.gnu.org/patch/?7473
+
+From 8958c3cb7b77ec50d8dae0490d8c80dee798e20d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gmail.com>
+Date: Fri, 18 Feb 2011 06:13:20 +0100
+Subject: [PATCH] Don't generate files.h at build-time using an execution test.
+
+The *_LOC variables are never used in the build itself, but only in the
+built code; this means that they don't need to be known to ./configure at
+all.
+
+Since the previous method made acct not cross-compilable at all, this is
+much preferred.
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,11 +69,6 @@ SYS_LASTCOMM = @SYS_LASTCOMM@
+ SYS_AC = @SYS_AC@
+ SYS_SA = @SYS_SA@
+ 
+-WTMP_FILE_LOC = @WTMP_FILE_LOC@
+-ACCT_FILE_LOC = @ACCT_FILE_LOC@
+-SAVACCT_FILE_LOC = @SAVACCT_FILE_LOC@
+-USRACCT_FILE_LOC = @USRACCT_FILE_LOC@
+-
+ compare-ac: ac
+ 	@echo
+ 	@echo "Running tests for ac"
+--- a/configure.ac
++++ b/configure.ac
+@@ -229,101 +229,6 @@ AC_CHECK_HEADER(sys/acct.h,
+ 		AC_EGREP_HEADER([comp_t],[sys/acct.h],[AC_DEFINE(HAVE_COMP_T, 1, Define if <sys/acct.h> uses the COMP_T type.)])
+   ) ]
+ )
+-dnl
+-dnl find out where utmp/pacct are stored
+-dnl
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <sys/types.h>
+-#include <stdint.h>	/* GNU/kFreeBSD */
+-#include <sys/acct.h>
+-#include <utmp.h>
+-
+-#ifndef WTMP_FILE
+-#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
+-        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define WTMP_FILE "/var/log/account/wtmp"
+-#  else
+-#    if defined(sun) || defined(AMIX)
+-#      define WTMP_FILE "/var/adm/wtmp"
+-#    else
+-#      if defined(sgi) || defined(SVR4)
+-#        define WTMP_FILE "/usr/adm/wtmp"
+-#      else
+-#        define WTMP_FILE "/usr/adm/wtmp"
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifndef ACCT_FILE
+-#  if defined(__FreeBSD__) || defined(__linux__) \
+-        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define ACCT_FILE "/var/log/account/pacct"
+-#  else
+-#    if defined(__NetBSD__)
+-#      define ACCT_FILE "/var/log/account/acct"
+-#    else
+-#      if defined(sun) || defined(AMIX)
+-#        define ACCT_FILE "/var/adm/pacct"
+-#      else
+-#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
+-#          define ACCT_FILE "/usr/adm/pacct"
+-#        else
+-#          define ACCT_FILE "/usr/adm/acct"
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifndef SAVACCT_FILE
+-#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+-        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define SAVACCT_FILE "/var/log/account/savacct"
+-#  else
+-#    if defined(sun) || defined(AMIX)
+-#      define SAVACCT_FILE "/var/adm/savacct"
+-#    else
+-#      if defined(sgi) || defined(SVR4)
+-#        define SAVACCT_FILE "/usr/adm/savacct"
+-#      else
+-#        define SAVACCT_FILE "/usr/adm/savacct"
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-#ifndef USRACCT_FILE
+-#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
+-        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
+-#    define USRACCT_FILE "/var/log/account/usracct"
+-#  else
+-#    if defined(sun) || defined(AMIX)
+-#      define USRACCT_FILE "/var/adm/usracct"
+-#    else
+-#      if defined(sgi) || defined(SVR4)
+-#        define USRACCT_FILE "/usr/adm/usracct"
+-#      else
+-#        define USRACCT_FILE "/usr/adm/usracct"
+-#      endif
+-#    endif
+-#  endif
+-#endif
+-
+-main ()
+-{
+-  FILE *fp;
+-  fp = fopen ("locs", "w");
+-  fprintf (fp, "WTMP_FILE_LOC=%s\n", WTMP_FILE);
+-  fprintf (fp, "ACCT_FILE_LOC=%s\n", ACCT_FILE);
+-  fprintf (fp, "SAVACCT_FILE_LOC=%s\n", SAVACCT_FILE);
+-  fprintf (fp, "USRACCT_FILE_LOC=%s\n", USRACCT_FILE);
+-  fclose (fp);
+-  exit(0);
+-}
+-]])],[. ./locs; rm locs],[echo "Error -- could not locate your wtmp and acct files."; exit 1],[echo "Sorry -- you cannot cross-compile this package (FIXME)."; exit 1 ])
+ 
+ dnl types
+ AC_TYPE_PID_T dnl for sys/acct.h
+@@ -367,12 +272,6 @@ AC_SUBST(ACCTON_MAN)
+ AC_SUBST(LASTCOMM_MAN)
+ AC_SUBST(SA_MAN)
+ 
+-dnl Substitutions for file locations
+-AC_SUBST(WTMP_FILE_LOC)
+-AC_SUBST(ACCT_FILE_LOC)
+-AC_SUBST(SAVACCT_FILE_LOC)
+-AC_SUBST(USRACCT_FILE_LOC)
+-
+ dnl Dump the makefiles and etc.
+-AC_CONFIG_FILES([Makefile lib/Makefile files.h version.h])
++AC_CONFIG_FILES([Makefile lib/Makefile version.h])
+ AC_OUTPUT
+--- /dev/null
++++ b/files.h
+@@ -0,0 +1,120 @@
++/* files.h.in
++ *
++ * file locations
++ *
++ */
++
++#ifndef FILES_H
++#define FILES_H
++
++#include "config.h"
++
++#include <sys/types.h>
++
++#ifdef LINUX_MULTIFORMAT
++# include "linux-acct.h"
++#else
++# include <stdint.h> /* GNU/kFreeBSD */
++# include <sys/acct.h>
++# if defined __FreeBSD__ || defined __FreeBSD_kernel__
++#  include <osreldate.h>
++#  if defined __FreeBSD_kernel__
++#   define __FreeBSD_version __FreeBSD_kernel_version
++#  endif /* __FreeBSD_kernel__ */
++#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
++#   define acct acctv2
++#   define ac_flag ac_flagx
++#  endif
++# endif
++#endif
++
++#include <utmp.h>
++
++#ifndef WTMP_FILE
++#  if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__linux__) \
++        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++#    define WTMP_FILE "/var/log/account/wtmp"
++#  else
++#    if defined(sun) || defined(AMIX)
++#      define WTMP_FILE "/var/adm/wtmp"
++#    else
++#      if defined(sgi) || defined(SVR4)
++#        define WTMP_FILE "/usr/adm/wtmp"
++#      else
++#        define WTMP_FILE "/usr/adm/wtmp"
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifndef ACCT_FILE
++#  if defined(__FreeBSD__) || defined(__linux__) \
++        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++#    define ACCT_FILE "/var/log/account/pacct"
++#  else
++#    if defined(__NetBSD__)
++#      define ACCT_FILE "/var/log/account/acct"
++#    else
++#      if defined(sun) || defined(AMIX)
++#        define ACCT_FILE "/var/adm/pacct"
++#      else
++#        if defined(sgi) || defined(SVR4) || defined(M_XENIX)
++#          define ACCT_FILE "/usr/adm/pacct"
++#        else
++#          define ACCT_FILE "/usr/adm/acct"
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifndef SAVACCT_FILE
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
++        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++#    define SAVACCT_FILE "/var/log/account/savacct"
++#  else
++#    if defined(sun) || defined(AMIX)
++#      define SAVACCT_FILE "/var/adm/savacct"
++#    else
++#      if defined(sgi) || defined(SVR4)
++#        define SAVACCT_FILE "/usr/adm/savacct"
++#      else
++#        define SAVACCT_FILE "/usr/adm/savacct"
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifndef USRACCT_FILE
++#  if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__linux__) \
++        || defined(__FreeBSD_kernel__) || defined(__GLIBC__)
++#    define USRACCT_FILE "/var/log/account/usracct"
++#  else
++#    if defined(sun) || defined(AMIX)
++#      define USRACCT_FILE "/var/adm/usracct"
++#    else
++#      if defined(sgi) || defined(SVR4)
++#        define USRACCT_FILE "/usr/adm/usracct"
++#      else
++#        define USRACCT_FILE "/usr/adm/usracct"
++#      endif
++#    endif
++#  endif
++#endif
++
++#define WTMP_FILE_LOC WTMP_FILE
++#define ACCT_FILE_LOC ACCT_FILE
++#define SAVACCT_FILE_LOC SAVACCT_FILE
++#define USRACCT_FILE_LOC USRACCT_FILE
++
++/* Workaround for a kernel includes problem */
++#if defined(__linux__) && defined(__alpha__)
++#undef AHZ
++#define AHZ 1024
++#endif
++
++#ifndef AHZ
++#define AHZ 64
++#endif
++
++#endif /* ! FILES_H */
+--- a/files.h.in
++++ /dev/null
+@@ -1,48 +0,0 @@
+-/* files.h.in
+- *
+- * file locations
+- *
+- */
+-
+-#ifndef FILES_H
+-#define FILES_H
+-
+-#include "config.h"
+-
+-#include <sys/types.h>
+-
+-#ifdef LINUX_MULTIFORMAT
+-# include "linux-acct.h"
+-#else
+-# include <stdint.h> /* GNU/kFreeBSD */
+-# include <sys/acct.h>
+-# if defined __FreeBSD__ || defined __FreeBSD_kernel__
+-#  include <osreldate.h>
+-#  if defined __FreeBSD_kernel__
+-#   define __FreeBSD_version __FreeBSD_kernel_version
+-#  endif /* __FreeBSD_kernel__ */
+-#  if __FreeBSD_version >= 700100 /* FreeBSD 7.0-STABLE */
+-#   define acct acctv2
+-#   define ac_flag ac_flagx
+-#  endif
+-# endif
+-#endif
+-
+-#include <utmp.h>
+-
+-#define WTMP_FILE_LOC "@WTMP_FILE_LOC@"
+-#define ACCT_FILE_LOC "@ACCT_FILE_LOC@"
+-#define SAVACCT_FILE_LOC "@SAVACCT_FILE_LOC@"
+-#define USRACCT_FILE_LOC "@USRACCT_FILE_LOC@"
+-
+-/* Workaround for a kernel includes problem */
+-#if defined(__linux__) && defined(__alpha__)
+-#undef AHZ
+-#define AHZ 1024
+-#endif
+-
+-#ifndef AHZ
+-#define AHZ 64
+-#endif
+-
+-#endif /* ! FILES_H */