/usr/share/sysmerge -> /var/sysmerge

requested by several
discussed with deraadt@

Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2015/08/23 18:50:33 deraadt Exp $
+# $OpenBSD: Makefile,v 1.68 2015/08/24 10:41:21 ajacoutot Exp $
 .include <bsd.own.mk>
 .include <bsd.xconf.mk>
 
@@ -59,10 +59,10 @@ beforeinstall beforebuild:
 afterinstall afterbuild:
 	exec ${MAKE} fix-appd
 	/usr/sbin/makewhatis -Qv ${DESTDIR}/usr/X11R6/man
-	touch ${DESTDIR}/usr/share/sysmerge/xetcsum
+	touch ${DESTDIR}/var/sysmerge/xetcsum
 	cd ${DESTDIR}/ && \
 		sort ${.CURDIR}/distrib/sets/lists/xetc/{mi,md.${MACHINE}} | \
-		xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/xetcsum || true
+		xargs sha256 -h ${DESTDIR}/var/sysmerge/xetcsum || true
 	cd distrib/sets && exec ${MAKE}
 
 install-mk:

distrib/sets/Makefile

@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2014/08/28 17:11:19 matthieu Exp $
+# $OpenBSD: Makefile,v 1.4 2015/08/24 10:41:21 ajacoutot Exp $
 
 DB = /usr/X11R6/lib/locate/xorg.db
-XETC = ${DESTDIR}/usr/share/sysmerge/xetc.tgz
+XETC = ${DESTDIR}/var/sysmerge/xetc.tgz
 
 all: tarxetc makedb
 

distrib/sets/lists/xbase/mi

@@ -427,9 +427,9 @@
 ./usr/X11R6/share/xcb/xcb.xsd
 ./usr/X11R6/share/xcb/xkb.xml
 ./usr/share
-./usr/share/sysmerge
-./usr/share/sysmerge/xetc.tgz
 ./var
 ./var/cache
 ./var/cache/fontconfig
 ./var/cache/fontconfig/CACHEDIR.TAG
+./var/sysmerge
+./var/sysmerge/xetc.tgz

distrib/sets/lists/xetc/mi

@@ -34,4 +34,4 @@
 ./etc/fonts/conf.d/69-unifont.conf
 ./etc/fonts/conf.d/80-delicious.conf
 ./etc/fonts/conf.d/90-synthetic.conf
-./usr/share/sysmerge/xetcsum
+./var/sysmerge/xetcsum

distrib/sets/makexetc

@@ -1,9 +1,9 @@
 #!/bin/sh
-#	$OpenBSD: makexetc,v 1.1 2014/08/28 17:08:33 matthieu Exp $
+#	$OpenBSD: makexetc,v 1.2 2015/08/24 10:41:21 ajacoutot Exp $
 
 pwd=`pwd`
 listsdir=`pwd`/lists
-tardir=$DESTDIR/usr/share/sysmerge
+tardir=$DESTDIR/var/sysmerge
 
 TMP=`mktemp /tmp/_makexetc.XXXXXXXXXX` || exit 1
 trap 'rm -f $TMP'  0 1 15