--- /usr/portage/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild	2015-09-09 18:24:16.000000000 +0200
+++ /usr/portage/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild	2016-02-24 12:17:00.411002059 +0100
@@ -49,7 +49,7 @@ 
 
 pkg_setup() {
 	enewgroup nullmail 88
-	enewuser nullmail 88 -1 /var/nullmailer nullmail
+	enewuser nullmail 88 -1 /var/spool/nullmailer nullmail
 }
 
 src_prepare() {
@@ -78,18 +78,20 @@ 
 		-e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \
 		-i configure.in || die
 	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	sed -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" -i doc/nullmailer-send.8
+	mv configure.in configure.ac
 	eautoreconf
 }
 
 src_configure() {
 	# Note that we pass a different directory below due to bugs in the makefile!
 	econf \
-		--localstatedir=/var \
+		--localstatedir=/var/spool \
 		$(use_enable ssl tls)
 }
 
 src_install () {
-	emake DESTDIR="${D}" localstatedir=/var/nullmailer install
+	emake DESTDIR="${D}" install
 
 	dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO
 
@@ -102,22 +104,22 @@ 
 	fowners root:nullmail /etc/nullmailer/remotes
 
 	# daemontools stuff
-	dodir /var/nullmailer/service{,/log}
+	dodir /var/spool/nullmailer/service{,/log}
 
-	insinto /var/nullmailer/service
+	insinto /var/spool/nullmailer/service
 	newins scripts/nullmailer.run run
-	fperms 700 /var/nullmailer/service/run
+	fperms 700 /var/spool/nullmailer/service/run
 
-	insinto /var/nullmailer/service/log
+	insinto /var/spool/nullmailer/service/log
 	newins scripts/nullmailer-log.run run
-	fperms 700 /var/nullmailer/service/log/run
+	fperms 700 /var/spool/nullmailer/service/log/run
 
 	# usability
 	dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail
 
 	# permissions stuff
-	keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue}
-	fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue}
+	keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
+	fperms 770 /var/log/nullmailer /var/spool/nullmailer/{tmp,queue}
 	fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq
 	fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq
 
@@ -126,13 +128,13 @@ 
 }
 
 pkg_postinst() {
-	if [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then
-		mkfifo "${ROOT}"/var/nullmailer/trigger
+	if [ ! -e "${ROOT}"/var/spool/nullmailer/trigger ]; then
+		mkfifo "${ROOT}"/var/spool/nullmailer/trigger
 	fi
 	chown nullmail:nullmail \
-		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} || die
-	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} || die
-	chmod 660 "${ROOT}"/var/nullmailer/trigger || die
+		"${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue,trigger} || die
+	chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/spool/nullmailer/{tmp,queue} || die
+	chmod 660 "${ROOT}"/var/spool/nullmailer/trigger || die
 
 	# This contains passwords, so should be secure
 	chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die
@@ -146,13 +148,13 @@ 
 	#elog "To start nullmailer at boot you may use either the nullmailer init.d"
 	#elog "script, or emerge sys-process/supervise-scripts, enable the"
 	#elog "svscan init.d script and create the following link:"
-	#elog "ln -fs /var/nullmailer/service /service/nullmailer"
+	#elog "ln -fs /var/spool/nullmailer/service /service/nullmailer"
 	#echo
 }
 
 pkg_postrm() {
-	if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then
-		rm "${ROOT}"/var/nullmailer/trigger || die
+	if [[ -e "${ROOT}"/var/spool/nullmailer/trigger ]]; then
+		rm "${ROOT}"/var/spool/nullmailer/trigger || die
 	fi
 }
 
--- /usr/portage/mail-mta/nullmailer/files/init.d-nullmailer-r4	2015-08-09 22:34:52.000000000 +0200
+++ /usr/portage/mail-mta/nullmailer/files/init.d-nullmailer-r4	2016-02-24 12:08:38.384862545 +0100
@@ -5,9 +5,9 @@ 
 
 command="/usr/sbin/nullmailer-send"
 
-start_stop_daemon_args="--chdir /var/nullmailer --user nullmail:nullmail"
+start_stop_daemon_args="--chdir /var/spool/nullmailer --user nullmail:nullmail"
 
-required_dirs="/var/nullmailer"
+required_dirs="/var/spool/nullmailer"
 pidfile="/run/nullmailer.pid"
 command_background="true"
 command_args="-s"
--- /usr/portage/mail-mta/nullmailer/files/nullmailer.service	2015-08-09 22:34:52.000000000 +0200
+++ /usr/portage/mail-mta/nullmailer/files/nullmailer.service	2016-02-24 12:09:08.552750931 +0100
@@ -2,12 +2,12 @@ 
 Description=Nullmailer relay-only MTA
 Requires=network.target
 After=local-fs.target syslog.target
-ConditionPathExists=/var/nullmailer/queue
+ConditionPathExists=/var/spool/nullmailer/queue
 ConditionPathExists=/etc/nullmailer/defaultdomain
 ConditionPathExists=/etc/nullmailer/me
 
 [Service]
-WorkingDirectory=/var/nullmailer
+WorkingDirectory=/var/spool/nullmailer
 ExecStart=/usr/sbin/nullmailer-send -s
 User=nullmail
 Group=nullmail