Module Name: src
Committed By: mrg
Date: Mon Mar 11 09:20:14 UTC 2019
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xdebug: mi
src/external/mit/xorg/bin: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/bin/transset: Makefile
Log Message:
install transset.
To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/transset/Makefile
cvs rdiff -u -r1.1111 -r1.1112 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.149 src/distrib/sets/lists/xbase/mi:1.150
--- src/distrib/sets/lists/xbase/mi:1.149 Sun Mar 10 11:18:02 2019
+++ src/distrib/sets/lists/xbase/mi Mon Mar 11 09:20:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.149 2019/03/10 11:18:02 mrg Exp $
+# $NetBSD: mi,v 1.150 2019/03/11 09:20:13 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -62,6 +62,7 @@
./usr/X11R7/bin/ssh-askpass -unknown- xorg
./usr/X11R7/bin/startx -unknown- xorg
./usr/X11R7/bin/sxpm -unknown- xorg
+./usr/X11R7/bin/transset -unknown- xorg
./usr/X11R7/bin/twm -unknown- xorg
./usr/X11R7/bin/ucs2any -unknown- xorg
./usr/X11R7/bin/uxterm -unknown- xorg
@@ -148,7 +149,6 @@
./usr/X11R7/include/GL base-x11-root xorg
./usr/X11R7/include/GL/internal base-x11-root xorg
./usr/X11R7/include/KHR base-x11-root xorg
-./usr/X11R7/include/vdpau base-x11-root xorg
./usr/X11R7/include/X11 base-x11-root xorg
./usr/X11R7/include/X11/ICE base-x11-root xorg
./usr/X11R7/include/X11/PM base-x11-root xorg
@@ -274,6 +274,7 @@
./usr/X11R7/include/libdrm/nouveau/nvif base-x11-root xorg
./usr/X11R7/include/libkms base-x11-root xorg
./usr/X11R7/include/pixman-1 base-x11-root xorg
+./usr/X11R7/include/vdpau base-x11-root xorg
./usr/X11R7/include/xcb base-x11-root xorg
./usr/X11R7/include/xorg base-x11-root xorg
./usr/X11R7/lib base-x11-root xorg,compatx11dir
@@ -1310,6 +1311,7 @@
./usr/X11R7/man/cat1/ssh-askpass.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/startx.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/sxpm.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/transset.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/twm.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/ucs2any.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/viewres.0 -unknown- .cat,xorg
@@ -1455,6 +1457,7 @@
./usr/X11R7/man/html1/ssh-askpass.html -unknown- html,xorg
./usr/X11R7/man/html1/startx.html -unknown- html,xorg
./usr/X11R7/man/html1/sxpm.html -unknown- html,xorg
+./usr/X11R7/man/html1/transset.html -unknown- html,xorg
./usr/X11R7/man/html1/twm.html -unknown- html,xorg
./usr/X11R7/man/html1/ucs2any.html -unknown- html,xorg
./usr/X11R7/man/html1/viewres.html -unknown- html,xorg
@@ -1601,6 +1604,7 @@
./usr/X11R7/man/man1/ssh-askpass.1 -unknown- .man,xorg
./usr/X11R7/man/man1/startx.1 -unknown- .man,xorg
./usr/X11R7/man/man1/sxpm.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/transset.1 -unknown- .man,xorg
./usr/X11R7/man/man1/twm.1 -unknown- .man,xorg
./usr/X11R7/man/man1/ucs2any.1 -unknown- .man,xorg
./usr/X11R7/man/man1/viewres.1 -unknown- .man,xorg
Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.29 src/distrib/sets/lists/xdebug/mi:1.30
--- src/distrib/sets/lists/xdebug/mi:1.29 Fri Mar 8 09:58:23 2019
+++ src/distrib/sets/lists/xdebug/mi Mon Mar 11 09:20:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.29 2019/03/08 09:58:23 mrg Exp $
+# $NetBSD: mi,v 1.30 2019/03/11 09:20:13 mrg Exp $
./etc/mtree/set.xdebug comp-sys-root
./usr/X11R7/lib -unknown- debuglib,xorg,compatx11dir
./usr/X11R7/lib/libFS_g.a -unknown- debuglib,xorg,compatx11file
@@ -152,6 +152,7 @@
./usr/libdata/debug/usr/X11R7/bin/smproxy.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/ssh-askpass.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/sxpm.debug -unknown- debug,xorg
+./usr/libdata/debug/usr/X11R7/bin/transset.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/twm.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/ucs2any.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/viewres.debug -unknown- debug,xorg
Index: src/external/mit/xorg/bin/Makefile
diff -u src/external/mit/xorg/bin/Makefile:1.14 src/external/mit/xorg/bin/Makefile:1.15
--- src/external/mit/xorg/bin/Makefile:1.14 Fri Mar 8 12:25:38 2019
+++ src/external/mit/xorg/bin/Makefile Mon Mar 11 09:20:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/03/08 12:25:38 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2019/03/11 09:20:13 mrg Exp $
SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \
cleanlinks cxpm editres \
@@ -9,7 +9,7 @@ SUBDIR= appres bdftopcf bdftruncate befo
makeg makestrs mergelib mkdirhier mkfontdir \
mkfontscale mkhtmlindex oclock proxymngr revpath \
rgb setxkbmap smproxy sxpm \
- twm ucs2any viewres x11perf xauth xbiff xcalc \
+ transset twm ucs2any viewres x11perf xauth xbiff xcalc \
xclipboard xclock xcmsdb xconsole xcutsel xditview xdm \
xdpyinfo xedit xev xeyes xf86dga xfd xfindproxy xfontsel \
xfs xfsinfo xfwp xgamma xgc xhost xinit xinput xkbcomp \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1111 src/share/mk/bsd.own.mk:1.1112
--- src/share/mk/bsd.own.mk:1.1111 Sun Mar 10 11:02:46 2019
+++ src/share/mk/bsd.own.mk Mon Mar 11 09:20:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1111 2019/03/10 11:02:46 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1112 2019/03/11 09:20:14 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1496,7 +1496,7 @@ HAVE_XORG_GLAMOR?= no
glu glw mesa-demos MesaGLUT MesaLib MesaLib.old MesaLib7 \
ico iceauth listres lndir \
luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \
- rstart setxkbmap showfont smproxy twm viewres \
+ rstart setxkbmap showfont smproxy transset twm viewres \
x11perf xauth xcalc xclipboard \
xclock xcmsdb xconsole xditview xdpyinfo xdriinfo xdm \
xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \
Added files:
Index: src/external/mit/xorg/bin/transset/Makefile
diff -u /dev/null src/external/mit/xorg/bin/transset/Makefile:1.1
--- /dev/null Mon Mar 11 09:20:14 2019
+++ src/external/mit/xorg/bin/transset/Makefile Mon Mar 11 09:20:13 2019
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2019/03/11 09:20:13 mrg Exp $
+
+.include <bsd.own.mk>
+
+PROG= transset
+SRCS= dsimple.c transSet.c
+
+CPPFLAGS+=${X11FLAGS.EXTENSION}
+
+LDADD+= -lX11
+DPADD+= ${LIBX11}
+
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+.include "../../xorg-pkg-ver.mk"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
