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

Move xetc set to xbase like etc in base. ok and a tweak by ajacoutot@

Browse Source 
There are still some issues, they will be fixed in tree.
This commit is contained in:
matthieu 2014-08-28 17:08:33 +00:00
parent d960df5510
commit 03381c3199
5 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2014/07/16 21:38:36 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.61 2014/08/28 17:08:33 matthieu Exp $
.include <bsd.own.mk> .include <bsd.own.mk>
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@ -101,7 +101,6 @@ release-clean:
release-install: release-install:
@exec ${MAKE} bootstrap-root @exec ${MAKE} bootstrap-root
@exec ${MAKE} install
.if ${MACHINE} == zaurus .if ${MACHINE} == zaurus
@if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \ @if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \
echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \ echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \
@ -111,6 +110,7 @@ release-install:
fi fi
.endif .endif
touch ${DESTDIR}/usr/share/sysmerge/xetcsum touch ${DESTDIR}/usr/share/sysmerge/xetcsum
@exec ${MAKE} install
XETCLIST=`mktemp /tmp/_xetcsum.XXXXXXXXXX` || exit 1; \ XETCLIST=`mktemp /tmp/_xetcsum.XXXXXXXXXX` || exit 1; \
sort distrib/sets/lists/xetc/{mi,md.${MACHINE}} > $${XETCLIST}; \ sort distrib/sets/lists/xetc/{mi,md.${MACHINE}} > $${XETCLIST}; \
cd ${DESTDIR} && \ cd ${DESTDIR} && \

8
distrib/sets/Makefile
View File

@ -1,8 +1,14 @@
# $OpenBSD: Makefile,v 1.1 2014/07/10 07:13:13 espie Exp $ # $OpenBSD: Makefile,v 1.2 2014/08/28 17:08:33 matthieu Exp $
DB = /usr/X11R6/lib/locate/xorg.db DB = /usr/X11R6/lib/locate/xorg.db
XETC = ${DESTDIR}/usr/share/sysmerge/xetc.tgz
all: ${XETC} makedb
makedb: makedb:
MACHINE=${MACHINE} /bin/sh ${.CURDIR}/makelocatedb ${OSrev} >${DESTDIR}${DB} MACHINE=${MACHINE} /bin/sh ${.CURDIR}/makelocatedb ${OSrev} >${DESTDIR}${DB}
${XETC}:
MACHINE=${MACHINE} /bin/sh ${.CURDIR}/makexetc
.PHONY: makedb .PHONY: makedb

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

@ -414,6 +414,9 @@
./usr/X11R6/share/xcb ./usr/X11R6/share/xcb
./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/sysmerge
./usr/share/sysmerge/xetc.tgz
./var ./var
./var/cache ./var/cache
./var/cache/fontconfig ./var/cache/fontconfig

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

@ -34,6 +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
./usr/share/sysmerge
./usr/share/sysmerge/xetcsum ./usr/share/sysmerge/xetcsum

15
distrib/sets/makexetc Executable file
View File

@ -0,0 +1,15 @@
#!/bin/sh
# $OpenBSD: makexetc,v 1.1 2014/08/28 17:08:33 matthieu Exp $
pwd=`pwd`
listsdir=`pwd`/lists
tardir=$DESTDIR/usr/share/sysmerge
TMP=`mktemp /tmp/_makexetc.XXXXXXXXXX` || exit 1
trap 'rm -f $TMP' 0 1 15
cd ${DESTDIR:=/}
(cd $pwd; sh gensetlist xetc) | sort >> $TMP
pax -w -d < $TMP | gzip -9 > ${tardir}/xetc.tgz
echo "done."