diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-08-28 17:08:34 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2014-08-28 17:08:34 +0000 |
| commit | 093f0c21d988860bab6497db0f78faa856e1c78a (patch) | |
| tree | fd22a5b5bbadc45f7e79754fa45a65805e2f939c | |
| parent | cb5d3fed6f051015d67342cc6a9fc6f5116a8080 (diff) | |
Move xetc set to xbase like etc in base. ok and a tweak by ajacoutot@
There are still some issues, they will be fixed in tree.
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | distrib/sets/Makefile | 8 | ||||
| -rw-r--r-- | distrib/sets/lists/xbase/mi | 3 | ||||
| -rw-r--r-- | distrib/sets/lists/xetc/mi | 2 | ||||
| -rwxr-xr-x | distrib/sets/makexetc | 15 |
5 files changed, 27 insertions, 5 deletions
@@ -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.xconf.mk> @@ -101,7 +101,6 @@ release-clean: release-install: @exec ${MAKE} bootstrap-root - @exec ${MAKE} install .if ${MACHINE} == zaurus @if [ -f $(DESTDIR)/etc/X11/xorg.conf ]; then \ echo "Not overwriting existing" $(DESTDIR)/etc/X11/xorg.conf; \ @@ -111,6 +110,7 @@ release-install: fi .endif touch ${DESTDIR}/usr/share/sysmerge/xetcsum + @exec ${MAKE} install XETCLIST=`mktemp /tmp/_xetcsum.XXXXXXXXXX` || exit 1; \ sort distrib/sets/lists/xetc/{mi,md.${MACHINE}} > $${XETCLIST}; \ cd ${DESTDIR} && \ diff --git a/distrib/sets/Makefile b/distrib/sets/Makefile index c32ce3bee..6316ce7d3 100644 --- a/distrib/sets/Makefile +++ b/distrib/sets/Makefile @@ -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 +XETC = ${DESTDIR}/usr/share/sysmerge/xetc.tgz + +all: ${XETC} makedb makedb: MACHINE=${MACHINE} /bin/sh ${.CURDIR}/makelocatedb ${OSrev} >${DESTDIR}${DB} +${XETC}: + MACHINE=${MACHINE} /bin/sh ${.CURDIR}/makexetc + .PHONY: makedb diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi index 8f3cb8ef4..d53295a49 100644 --- a/distrib/sets/lists/xbase/mi +++ b/distrib/sets/lists/xbase/mi @@ -414,6 +414,9 @@ ./usr/X11R6/share/xcb ./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 diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi index 390c7ce57..312f06ede 100644 --- a/distrib/sets/lists/xetc/mi +++ b/distrib/sets/lists/xetc/mi @@ -34,6 +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 -./usr/share/sysmerge ./usr/share/sysmerge/xetcsum diff --git a/distrib/sets/makexetc b/distrib/sets/makexetc new file mode 100755 index 000000000..c854d73a0 --- /dev/null +++ b/distrib/sets/makexetc @@ -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." |