qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
requested by several
discussed with deraadt@
This commit is contained in:
ajacoutot 2015-08-24 10:41:21 +00:00
parent 818b86d0a7
commit 3202498a1b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -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.own.mk>
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@ -59,10 +59,10 @@ beforeinstall beforebuild:
afterinstall afterbuild: afterinstall afterbuild:
exec ${MAKE} fix-appd exec ${MAKE} fix-appd
/usr/sbin/makewhatis -Qv ${DESTDIR}/usr/X11R6/man /usr/sbin/makewhatis -Qv ${DESTDIR}/usr/X11R6/man
touch ${DESTDIR}/usr/share/sysmerge/xetcsum touch ${DESTDIR}/var/sysmerge/xetcsum
cd ${DESTDIR}/ && \ cd ${DESTDIR}/ && \
sort ${.CURDIR}/distrib/sets/lists/xetc/{mi,md.${MACHINE}} | \ 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} cd distrib/sets && exec ${MAKE}
install-mk: install-mk:

4
distrib/sets/Makefile
View File

@ -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 DB = /usr/X11R6/lib/locate/xorg.db
XETC = ${DESTDIR}/usr/share/sysmerge/xetc.tgz XETC = ${DESTDIR}/var/sysmerge/xetc.tgz
all: tarxetc makedb all: tarxetc makedb

4
distrib/sets/lists/xbase/mi
View File

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

2
distrib/sets/lists/xetc/mi
View File

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

4
distrib/sets/makexetc
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/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` pwd=`pwd`
listsdir=`pwd`/lists listsdir=`pwd`/lists
tardir=$DESTDIR/usr/share/sysmerge tardir=$DESTDIR/var/sysmerge
TMP=`mktemp /tmp/_makexetc.XXXXXXXXXX` || exit 1 TMP=`mktemp /tmp/_makexetc.XXXXXXXXXX` || exit 1
trap 'rm -f $TMP' 0 1 15 trap 'rm -f $TMP' 0 1 15