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

Install resource files in /usr/X11R6/share/X11/app-defaults

Browse Source 
/etc/X11/app-defaults stays 1st in the libXt search path so, people
and ports can put customized versions there if needed.
If you didn't customize the versions in /etc/X11/app-defaults, they
should be removed to avoid future issues when one file changes.

discussed at g2k14 and ok ajacoutot@
This commit is contained in:
matthieu 2014-08-13 21:02:16 +00:00
parent 08e6b37d90
commit 7afaae9fe9
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ssh-askpass/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2011/06/23 22:48:59 naddy Exp $
# $OpenBSD: Makefile,v 1.14 2014/08/13 21:02:16 matthieu Exp $
.include <bsd.xconf.mk>
PROG= ssh-askpass
@ -33,7 +33,7 @@ x11-ssh-askpass.o: $(CLASS)_ad.h
afterinstall:
${INSTALL_DATA} $(CLASS).ad \
$(DESTDIR)/etc/X11/app-defaults/$(CLASS)
$(DESTDIR)${X11BASE}/share/X11/app-defaults/$(CLASS)
beforedepend: $(CLASS)_ad.h

4
app/xlockmore/Makefile.bsd-wrapper
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.11 2011/12/10 14:54:18 matthieu Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2014/08/13 21:02:16 matthieu Exp $
.include <bsd.xconf.mk>
@ -11,7 +11,7 @@ config.status:
CONFIG_SITE=$(CONFIG_SITE) \
sh ${.CURDIR}/configure --prefix=${X11BASE} \
--datarootdir=${X11BASE} \
--enable-appdefaultdir=/etc/X11/app-defaults \
--enable-appdefaultdir=${X11BASE}/share/X11/app-defaults \
--enable-syslog --without-motif --without-ttf \
--without-gtk2 --without-gtk --without-esound \
--without-rplay --without-ftgl

5
app/xsystrace/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2011/06/23 22:48:59 naddy Exp $
# $OpenBSD: Makefile,v 1.13 2014/08/13 21:02:16 matthieu Exp $
.include <bsd.xconf.mk>
PROG= xsystrace
@ -15,7 +15,8 @@ SRCS= main.c interface.c callbacks.c policy.c
afterinstall:
${INSTALL_DATA} \
${.CURDIR}/Xsystrace.ad ${DESTDIR}/etc/X11/app-defaults/Xsystrace
${.CURDIR}/Xsystrace.ad \
${DESTDIR}${X11BASE}/share/X11/app-defaults/Xsystrace
MANDIR= ${X11BASE}/man/man

13
app/xterm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.25 2014/07/31 20:13:40 matthieu Exp $
# $OpenBSD: Makefile,v 1.26 2014/08/13 21:02:16 matthieu Exp $
.include <bsd.xconf.mk>
SUBDIR= icons resize
@ -26,7 +26,6 @@ SRCS= TekPrsTbl.c Tekproc.c VTPrsTbl.c button.c cachedGCs.c \
scrollback.c scrollbar.c tabs.c trace.c util.c version.c xstrings.c
MANDIR= ${X11BASE}/man/man
XETC?= /etc/X11
.if ${MACHINE_ARCH} == "sh"
charproc.o: charproc.c
@ -61,7 +60,7 @@ PATCH_YMD != sed -n '/XTERM_DATE/s,[^0-9/.-]*,,gp' ${.CURDIR}/version.h
sed -e 's#__vendorversion__#"X Window System"#g' \
-e 's#__mansuffix__#1#g' \
-e 's#__miscmansuffix__#7#g' \
-e 's#__apploaddir__#${X11ETC}/app-defaults#g' \
-e 's#__apploaddir__#${X11BASE}/share/X11/app-defaults#g' \
-e 's%__app_version__%Patch\ \#'$(PATCH_NUM)% \
-e 's%__app_date__%'${PATCH_YMD}% \
-e s%__default_termname__%xterm% \
@ -85,13 +84,13 @@ afterinstall:
${INSTALL} ${INSTALL_COPY} -m 755 ${.CURDIR}/koi8rxterm \
${DESTDIR}${BINDIR}
${INSTALL_DATA} ${.CURDIR}/XTerm.ad \
${DESTDIR}${XETC}/app-defaults/XTerm
${DESTDIR}${X11BASE}/share/X11/app-defaults/XTerm
${INSTALL_DATA} ${.CURDIR}/XTerm-col.ad \
${DESTDIR}${XETC}/app-defaults/XTerm-color
${DESTDIR}${X11BASE}/share/X11/app-defaults/XTerm-color
${INSTALL_DATA} ${.CURDIR}/UXTerm.ad \
${DESTDIR}${XETC}/app-defaults/UXTerm
${DESTDIR}${X11BASE}/share/X11/app-defaults/UXTerm
${INSTALL_DATA} ${.CURDIR}/KOI8RXTerm.ad \
${DESTDIR}${XETC}/app-defaults/KOI8RXTerm
${DESTDIR}${X11BASE}/share/X11/app-defaults/KOI8RXTerm
obj: _xenocara_obj

4
lib/libXt/Makefile.bsd-wrapper
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.7 2013/08/13 07:07:18 guenther Exp $
# $OpenBSD: Makefile.bsd-wrapper,v 1.8 2014/08/13 21:02:16 matthieu Exp $
SHARED_LIBS= Xt 11.0
CONFIGURE_ARGS= --with-appdefaultdir=/etc/X11/app-defaults \
CONFIGURE_ARGS= --with-appdefaultdir=/usr/X11R6/share/X11/app-defaults \
--without-xmlto --without-fop --without-xsltproc --without-glib
.include <bsd.xorg.mk>