CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Tue Apr 27 02:11:55 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
disable attribute warnings. new libXt triggers them for now..
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.21 src/external/mit/xorg/bin/xterm/Makefile:1.22
--- src/external/mit/xorg/bin/xterm/Makefile:1.21 Wed Feb 17 03:06:07 2021
+++ src/external/mit/xorg/bin/xterm/Makefile Tue Apr 27 02:11:55 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2021/02/17 03:06:07 mrg Exp $
+# $NetBSD: Makefile,v 1.22 2021/04/27 02:11:55 mrg Exp $
.include
@@ -24,6 +24,7 @@ CPPFLAGS+= -I. \
${X11FLAGS.VERSION}
CWARNFLAGS.clang+= -Wno-empty-body
+CWARNFLAGS.gcc+= -Wno-error=attributes
APPDEFS=XTerm.ad XTerm-color.ad
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Mon Apr 26 22:04:51 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xdm/chooser: Makefile
src/external/mit/xorg/bin/xsm: Makefile
Log Message:
make build with new libXt.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/chooser/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xsm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.6
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.5 Wed Mar 6 12:40:23 2019
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Mon Apr 26 22:04:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/03/06 12:40:23 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/26 22:04:51 mrg Exp $
NOMAN= 1
@@ -6,7 +6,8 @@ NOMAN= 1
PROG= chooser
-CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS+= -D_CONST_X_STRING=1
APPDEFS=Chooser
@@ -21,3 +22,6 @@ BINDIR= ${XDMCHOOSERPATH:H}
.include
.PATH: ${X11SRCDIR.xdm}/app-defaults
+
+# XXX libXt
+COPTS.chooser.c+= -Wno-incompatible-pointer-types
Index: src/external/mit/xorg/bin/xsm/Makefile
diff -u src/external/mit/xorg/bin/xsm/Makefile:1.3 src/external/mit/xorg/bin/xsm/Makefile:1.4
--- src/external/mit/xorg/bin/xsm/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xsm/Makefile Mon Apr 26 22:04:51 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $
.include
@@ -26,5 +26,8 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+# XXX libXt
+COPTS+= -Wno-incompatible-pointer-types
+
.include
.include
CVS commit: src/external/mit/xorg/bin/xterm/resize
Module Name:src Committed By: rin Date: Sat Feb 27 21:13:09 UTC 2021 Removed Files: src/external/mit/xorg/bin/xterm/resize: Makefile Log Message: Clean up file obsoleted by migration to usr.bin/resize. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/external/mit/xorg/bin/xterm/resize/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Wed Feb 17 03:06:07 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
remove -DOPT_* from here (now in xtermcfg.h).
restore comment lost in rev 1.18.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.20 src/external/mit/xorg/bin/xterm/Makefile:1.21
--- src/external/mit/xorg/bin/xterm/Makefile:1.20 Thu Feb 11 12:30:08 2021
+++ src/external/mit/xorg/bin/xterm/Makefile Wed Feb 17 03:06:07 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2021/02/11 12:30:08 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2021/02/17 03:06:07 mrg Exp $
.include
@@ -10,6 +10,9 @@ SRCS= button.c charproc.c charsets.c cur
charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \
svg.c html.c version.c
+# XXX
+# xterm.appdata.xml
+
CPPFLAGS+= -I. \
-I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
@@ -17,8 +20,6 @@ CPPFLAGS+= -I. \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DPROJECTROOT=${X11ROOTDIR} \
-DHAVE_CONFIG_H \
- -DOPT_GRAPHICS \
- -DOPT_SIXEL_GRAPHICS \
-D_REENTRANT \
${X11FLAGS.VERSION}
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Thu Feb 11 12:30:08 UTC 2021
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
add new files for xterm 366.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.19 src/external/mit/xorg/bin/xterm/Makefile:1.20
--- src/external/mit/xorg/bin/xterm/Makefile:1.19 Sun Dec 27 21:13:18 2020
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Feb 11 12:30:08 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2020/12/27 21:13:18 reinoud Exp $
+# $NetBSD: Makefile,v 1.20 2021/02/11 12:30:08 mrg Exp $
.include
@@ -8,7 +8,7 @@ SRCS= button.c charproc.c charsets.c cur
misc.c print.c ptydata.c screen.c scrollback.c scrollbar.c tabs.c \
util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c \
charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \
- version.c
+ svg.c html.c version.c
CPPFLAGS+= -I. \
-I${X11SRCDIR.${PROG}} \
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: nia Date: Mon Oct 26 16:24:09 UTC 2020 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: xdm(8): fix definitions of truetype fonts in the default resource file we don't ship with a truetype helvetica. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.4 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.5 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.4 Fri Mar 29 16:07:01 2019 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Mon Oct 26 16:24:09 2020 @@ -22,19 +22,19 @@ xlogin*greetFont: -adobe-helvetica-bold- xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1 xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*greetFace: Serif-24:bold:italic -xlogin*face: Helvetica-14 -xlogin*promptFace: Helvetica-14:bold -xlogin*failFace: Helvetica-14:bold +xlogin*greetFace: Sans-24 +xlogin*face: Sans-14 +xlogin*promptFace: Sans-14:bold +xlogin*failFace: Sans-14:bold XHASHelse xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1 xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1 xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1 xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1 -xlogin*greetFace: Serif-18:bold:italic -xlogin*face: Helvetica-12 -xlogin*promptFace: Helvetica-12:bold -xlogin*failFace: Helvetica-14:bold +xlogin*greetFace: Sans-18 +xlogin*face: Sans-12 +xlogin*promptFace: Sans-12:bold +xlogin*failFace: Sans-14:bold XHASHendif XHASHifdef COLOR
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Oct 12 11:43:11 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
define xsetroot in the right place
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.10 src/external/mit/xorg/bin/xinit/Makefile:1.11
--- src/external/mit/xorg/bin/xinit/Makefile:1.10 Sun Oct 11 10:08:26 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Oct 12 11:43:11 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
+# $NetBSD: Makefile,v 1.11 2020/10/12 11:43:11 nia Exp $
.include
@@ -14,6 +14,7 @@ CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DXSETROOT=${X11BINDIR}/xsetroot \
-DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Sun Oct 11 10:08:26 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
allow xsetroot to be used in default xinitrc
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.9 src/external/mit/xorg/bin/xinit/Makefile:1.10
--- src/external/mit/xorg/bin/xinit/Makefile:1.9 Mon Sep 21 13:51:55 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Sun Oct 11 10:08:26 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $
+# $NetBSD: Makefile,v 1.10 2020/10/11 10:08:26 nia Exp $
.include
@@ -21,6 +21,7 @@ CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINI
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
-DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm \
+ -DXSETROOT=${X11BINDIR}/xsetroot \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: nia
Date: Fri Oct 2 13:08:07 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
xterm: Enable SIXEL graphics support.
could also enable REGIS, it will require -lm and i suppose isn't
a default upstream yet(?)
test with "-ti vt340".
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.17 src/external/mit/xorg/bin/xterm/Makefile:1.18
--- src/external/mit/xorg/bin/xterm/Makefile:1.17 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/xterm/Makefile Fri Oct 2 13:08:07 2020
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile,v 1.17 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2020/10/02 13:08:07 nia Exp $
.include
PROG= xterm
SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \
- fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
- screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
- TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
- wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
-
-# graphics_regis.c graphics_sixel.c
-# xterm.appdata.xml
+ graphics.c graphics_sixel.c fontutils.c input.c linedata.c menu.c \
+ misc.c print.c ptydata.c screen.c scrollback.c scrollbar.c tabs.c \
+ util.c xstrings.c TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c \
+ charclass.c precompose.c wcwidth.c xutf8.c cachedGCs.c xtermcap.c \
+ version.c
CPPFLAGS+= -I. \
-I${X11SRCDIR.${PROG}} \
@@ -19,6 +17,8 @@ CPPFLAGS+= -I. \
-I${DESTDIR}${X11INCDIR}/freetype2/freetype \
-DPROJECTROOT=${X11ROOTDIR} \
-DHAVE_CONFIG_H \
+ -DOPT_GRAPHICS \
+ -DOPT_SIXEL_GRAPHICS \
-D_REENTRANT \
${X11FLAGS.VERSION}
CVS commit: src/external/mit/xorg/bin/xeyes
Module Name:src
Committed By: nia
Date: Thu Oct 1 21:22:47 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xeyes: Makefile
Log Message:
xeyes: Enable anti-aliasing with XRENDER
If you prefer the "classic" look, "xeyes +render"
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xeyes/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xeyes/Makefile
diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.2 src/external/mit/xorg/bin/xeyes/Makefile:1.3
--- src/external/mit/xorg/bin/xeyes/Makefile:1.2 Sun Mar 11 08:21:24 2018
+++ src/external/mit/xorg/bin/xeyes/Makefile Thu Oct 1 21:22:47 2020
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.2 2018/03/11 08:21:24 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2020/10/01 21:22:47 nia Exp $
.include
+CPPFLAGS+=-DXRENDER
+
PROG= xeyes
SRCS= xeyes.c Eyes.c transform.c
-LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
+LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 -lm
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Sep 21 13:51:55 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
also allow uxterm to be used in the default xinitrc
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.8 src/external/mit/xorg/bin/xinit/Makefile:1.9
--- src/external/mit/xorg/bin/xinit/Makefile:1.8 Mon Sep 21 08:20:04 2020
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 13:51:55 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $
+# $NetBSD: Makefile,v 1.9 2020/09/21 13:51:55 nia Exp $
.include
@@ -14,10 +14,12 @@ CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
-DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+ -DUXTERM=${X11BINDIR}/uxterm \
-DCTWM=${X11BINDIR}/ctwm \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xinit
Module Name:src
Committed By: nia
Date: Mon Sep 21 08:20:05 UTC 2020
Modified Files:
src/external/mit/xorg/bin/xinit: Makefile
Log Message:
Define CTWM when building xinit
This will allow ctwm to eventually be used in the default xinitrc.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xinit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinit/Makefile
diff -u src/external/mit/xorg/bin/xinit/Makefile:1.7 src/external/mit/xorg/bin/xinit/Makefile:1.8
--- src/external/mit/xorg/bin/xinit/Makefile:1.7 Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/bin/xinit/Makefile Mon Sep 21 08:20:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2019/03/11 06:25:55 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2020/09/21 08:20:04 nia Exp $
.include
@@ -13,10 +13,12 @@ CPPFLAGS+= ${X11FLAGS.CONNECTION} -DBIND
CPPSCRIPTS= startx xinitrc
CPPSCRIPTFLAGS_xinitrc= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXRDB=xrdb -DXMODMAP=xmodmap \
- -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm
+ -DTWM=twm -DXCLOCK=xclock -DXTERM=${X11BINDIR}/xterm \
+ -DCTWM=${X11BINDIR}/ctwm
CPPSCRIPTFLAGS_startx= -DXINITDIR=${XINITDIR} -DBINDIR=${X11BINDIR} \
-DSHELL_CMD=/bin/sh -DXAUTH=xauth -DXINIT=xinit \
-DXSERVER=${X11BINDIR}/X -DXTERM=${X11BINDIR}/xterm \
+ -DCTWM=${X11BINDIR}/ctwm \
-DHAS_COOKIE_MAKER \
-DMK_COOKIE='dd if=/dev/urandom bs=16 count=1 2>/dev/null | hexdump -e \\"%08x\\"'
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: martin Date: Fri Mar 29 16:07:01 UTC 2019 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: Fix edit accident in previous To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.3 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.4 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.3 Fri Mar 29 15:56:43 2019 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Fri Mar 29 16:07:01 2019 @@ -44,7 +44,7 @@ xlogin*innerFramesWidth: 2 xlogin*shdColor: grey30 xlogin*hiColor: grey90 xlogin*background: grey -xlogin*inpCollor: grey +xlogin*inpColor: grey !xlogin*foreground: darkgreen xlogin*greetColor: Blue3 xlogin*failColor: red
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: martin Date: Fri Mar 29 15:56:43 UTC 2019 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: Minor adjustment to the input background color (to better match the flag logo) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.2 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.3 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.2 Wed Mar 6 05:08:21 2019 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Fri Mar 29 15:56:43 2019 @@ -44,7 +44,7 @@ xlogin*innerFramesWidth: 2 xlogin*shdColor: grey30 xlogin*hiColor: grey90 xlogin*background: grey -xlogin*inpColor: grey80 +xlogin*inpCollor: grey !xlogin*foreground: darkgreen xlogin*greetColor: Blue3 xlogin*failColor: red
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: mrg Date: Fri Mar 8 12:25:39 UTC 2019 Modified Files: src/external/mit/xorg/bin: Makefile Log Message: build fc-conflist. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/bin/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/Makefile diff -u src/external/mit/xorg/bin/Makefile:1.13 src/external/mit/xorg/bin/Makefile:1.14 --- src/external/mit/xorg/bin/Makefile:1.13 Mon Jun 3 20:23:39 2013 +++ src/external/mit/xorg/bin/Makefile Fri Mar 8 12:25:38 2019 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.13 2013/06/03 20:23:39 mrg Exp $ +# $NetBSD: Makefile,v 1.14 2019/03/08 12:25:38 mrg Exp $ SUBDIR= appres bdftopcf bdftruncate beforelight bitmap ccmakedep \ cleanlinks cxpm editres \ - fc-cache fc-cat fc-list fc-match fc-pattern fc-query fc-scan \ - fc-validate \ + fc-cache fc-cat fc-conflist fc-list fc-match fc-pattern \ + fc-query fc-scan fc-validate \ fonttosfnt fslsfonts fstobdf glxgears glxinfo \ iceauth ico imake listres lndir luit makedepend \ makeg makestrs mergelib mkdirhier mkfontdir \
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src
Committed By: mrg
Date: Wed Mar 6 05:59:25 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
Log Message:
don't use ERE in sed. fortunately, thes strings are all at the
end of the line so we can anchor them with (make processed) $$.
i now have fonts that i can see again in xdm.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/bin/xdm/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.17 src/external/mit/xorg/bin/xdm/config/Makefile:1.18
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.17 Wed Mar 6 05:21:50 2019
+++ src/external/mit/xorg/bin/xdm/config/Makefile Wed Mar 6 05:59:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/03/06 05:21:50 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2019/03/06 05:59:25 mrg Exp $
.include
@@ -55,8 +55,8 @@ FILESBUILD_$f=yes
-e 's,MKTEMP_COMMAND,/usr/bin/mktemp,' \
-e 's,XCOMM,\#,' \
-e 's,XHASH,\#,' \
- -e 's,\,\\n\\,' \
- -e 's,\,\\,' \
+ -e 's,NLBS$$,\\n\\,' \
+ -e 's,BS$$,\\,' \
-e 's,/\*\*/,,g' \
< ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src
Committed By: mrg
Date: Wed Mar 6 05:21:50 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
Log Message:
- clean up a little and avoid leaving partial files
- put SEDSCRIPTS into FILES vs CONFIGFILES, so they're install properly
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/bin/xdm/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.16 src/external/mit/xorg/bin/xdm/config/Makefile:1.17
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.16 Wed Mar 6 04:43:50 2019
+++ src/external/mit/xorg/bin/xdm/config/Makefile Wed Mar 6 05:21:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/03/06 04:43:50 christos Exp $
+# $NetBSD: Makefile,v 1.17 2019/03/06 05:21:50 mrg Exp $
.include
@@ -31,6 +31,7 @@ FILESBUILD_$f=yes
.in:
${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
${TOOL_SED} \
-e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
-e 's,BITMAPDIR,${X11INCDIR}/X11/pixmaps,' \
@@ -56,14 +57,17 @@ FILESBUILD_$f=yes
-e 's,XHASH,\#,' \
-e 's,\,\\n\\,' \
-e 's,\,\\,' \
- -e 's,/\*\*/,,g' < ${.IMPSRC} > ${.TARGET}
+ -e 's,/\*\*/,,g' \
+ < ${.IMPSRC} > ${.TARGET}.tmp && mv ${.TARGET}.tmp ${.TARGET}
+
+CLEANFILES+= ${SEDSCRIPTS} ${SEDSCRIPTS:=.tmp}
CONFIGFILES+= GiveConsole TakeConsole \
- Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
- ${SEDSCRIPTS}
+ Xaccess Xservers.fs Xsession Xsetup_0 Xwilling
FILES+= xorg-bw.xpm xorg.xpm \
NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm \
- NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm
+ NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm \
+ ${SEDSCRIPTS}
FILESDIR= ${XDMDIR}
FILESDIR_xorg.xpm= ${X11INCDIR}/X11/pixmaps
FILESDIR_xorg-bw.xpm= ${X11INCDIR}/X11/pixmaps
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src Committed By: mrg Date: Wed Mar 6 05:08:21 UTC 2019 Modified Files: src/external/mit/xorg/bin/xdm/config: Xresources.in Log Message: merge our changes and their changes across the last few xdm releases. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xdm/config/Xresources.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xdm/config/Xresources.in diff -u src/external/mit/xorg/bin/xdm/config/Xresources.in:1.1 src/external/mit/xorg/bin/xdm/config/Xresources.in:1.2 --- src/external/mit/xorg/bin/xdm/config/Xresources.in:1.1 Wed Mar 6 04:43:50 2019 +++ src/external/mit/xorg/bin/xdm/config/Xresources.in Wed Mar 6 05:08:21 2019 @@ -15,13 +15,13 @@ xlogin*login.translations: #override BS xlogin*greeting: Welcome to CLIENTHOST xlogin*namePrompt: \040\040\040\040\040\040\040Login: -xlogin*fail: Login incorrect +xlogin*fail: Login incorrect or forbidden by policy XHASHif WIDTH > 800 xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1 -xlogin*font: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*promptFont: -adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1 -xlogin*failFont: -adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1 +xlogin*font: -adobe-helvetica-medium-o-normal-*-14-*-*-*-*-*-iso8859-1 +xlogin*promptFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 +xlogin*failFont: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1 xlogin*greetFace: Serif-24:bold:italic xlogin*face: Helvetica-14 xlogin*promptFace: Helvetica-14:bold @@ -57,6 +57,8 @@ xlogin*innerFramesWidth: 1 xlogin*shdColor: black xlogin*hiColor: black XHASHendif +#ifdef XPM +XHASHif PLANES >= 8 XHASHif 1 ! XDM has no support for images with alpha channel, so we precomputed a ! NetBSD logo with fixed background and use it here. If you change this @@ -75,8 +77,6 @@ XHASHelse ! Antialiased borders look ugly this way, but it works with arbitrary ! background colours. ! -#ifdef XPM -XHASHif PLANES >= 8 xlogin*logoFileName: BITMAPDIR/**//XDM_PIXMAP xlogin*useShape: true XHASHendif
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src
Committed By: christos
Date: Wed Mar 6 04:43:50 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
Added Files:
src/external/mit/xorg/bin/xdm/config: Xresources.in
Removed Files:
src/external/mit/xorg/bin/xdm/config: Xresources.cpp
Log Message:
make this work:
- fix sed rules
- change our own copy of Xresources from cpp to sed
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/xdm/config/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/bin/xdm/config/Xresources.cpp
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/xdm/config/Xresources.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.15 src/external/mit/xorg/bin/xdm/config/Makefile:1.16
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.15 Tue Mar 5 03:35:35 2019
+++ src/external/mit/xorg/bin/xdm/config/Makefile Tue Mar 5 23:43:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/03/05 08:35:35 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2019/03/06 04:43:50 christos Exp $
.include
@@ -23,18 +23,22 @@ DEFAULTVT= # defined empty
UUDECODE_FILES= NetBSD-flag.png
SEDSCRIPTS= Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
+.for f in ${SEDSCRIPTS}
+FILESBUILD_$f=yes
+.endfor
-SUFFIXES = .in
+.SUFFIXES: .in
.in:
- $(TOOL_SED) \
+ ${_MKTARGET_CREATE}
+ ${TOOL_SED} \
-e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
-e 's,BITMAPDIR,${X11INCDIR}/X11/pixmaps,' \
-e 's,XDM_PIXMAP,NetBSD.xpm,' \
-e 's,XDM_BWPIXMAP,NetBSD-bw.xpm,' \
-e 's,BINDIR,$(X11BINDIR),' \
-e 's,DEFAULTVT,$(DEFAULTVT),' \
- -e 's,XDMDIR,$(XDMDIR),'
+ -e 's,XDMDIR,$(XDMDIR),' \
-e 's,XDMLOGDIR,$(XDMLOGDIR),' \
-e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
-e 's,XDMPIDDIR,$(XDMPIDDIR),' \
@@ -50,14 +54,14 @@ SUFFIXES = .in
-e 's,MKTEMP_COMMAND,/usr/bin/mktemp,' \
-e 's,XCOMM,\#,' \
-e 's,XHASH,\#,' \
- -e 's,NLBS,\\n\\,' \
- -e 's,BS,\\,' \
- -e 's,/\*\*/,,g'
+ -e 's,\,\\n\\,' \
+ -e 's,\,\\,' \
+ -e 's,/\*\*/,,g' < ${.IMPSRC} > ${.TARGET}
-CONFIGFILES= GiveConsole TakeConsole \
+CONFIGFILES+= GiveConsole TakeConsole \
Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
${SEDSCRIPTS}
-FILES= xorg-bw.xpm xorg.xpm \
+FILES+= xorg-bw.xpm xorg.xpm \
NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm \
NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm
FILESDIR= ${XDMDIR}
Added files:
Index: src/external/mit/xorg/bin/xdm/config/Xresources.in
diff -u /dev/null src/external/mit/xorg/bin/xdm/config/Xresources.in:1.1
--- /dev/null Tue Mar 5 23:43:50 2019
+++ src/external/mit/xorg/bin/xdm/config/Xresources.in Tue Mar 5 23:43:50 2019
@@ -0,0 +1,101 @@
+Xcursor.theme: whiteglass
+
+xlogin*login.translations: #override BS
+ CtrlR: abort-display()NLBS
+ F1: set-session-argument(failsafe) finish-field()NLBS
+ Delete: delete-character()NLBS
+ Left: move-backward-character()NLBS
+ Right: move-forward-character()NLBS
+ Home: move-to-begining()NLBS
+ End: move-to-end()NLBS
+ CtrlKP_Enter: set-session-argument(failsafe) finish-field()NLBS
+ KP_Enter: set-session-argument() finish-field()NLBS
+ CtrlReturn: set-session-argument(failsafe) finish-field()NLBS
+ Return: set-session-argument() finish-field()
+
+xlogin*greeting: Welcome to CLIENTHOST
+xlogin*namePrompt: \040\040\040\040\040\040\040Login:
+xlogin*fail: Login incorrect
+
+XHASHif WIDTH > 800
+xlogin*greetFont: -adobe-helvetica-bold-o-normal-*-18-*-*-*-*-*-iso8859-1
+xlogin*font: -adobe-helvetica-medium-r-normal-*-14-*-*-*-*-*-iso8859-1
+xlogin*promptFont: -adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1
+xlogin*failFont: -adobe-helvetica-bold-r-normal-*-14-*-*-*-*-*-iso8859-1
+xlogin*greetFace: Serif-24:bold:italic
+xlogin*face: Helvetica-14
+xlogin*promptFace: Helvetica-14:bold
+xlogin*failFace: Helvetica-14:bold
+XHASHelse
+xlogin*greetFont: -adobe-helvetica-bold-o-normal--17-120-100-100-p-92-iso8859-1
+xlogin*font: -adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1
+xlogin*promptFont: -adobe-helvetica-bold-r-normal--12-120-75-75-p-70-iso8859-1
+xlogin*failFont: -adobe-helvetica-bold-o-normal--14-140-75-75-p-82-iso8859-1
+xlogin*greetFace: Serif-18:bold:italic
+xlogin*face: Helvetica-12
+xlogin*promptFace: Helvetica-12:bold
+xlogin*failFace: Helvetica-14:bold
+XHASHendif
+
+XHASHifdef COLOR
+xlogin*borderWidth: 1
+xlogin*frameWidth: 5
+xlogin*innerFramesWidth: 2
+xlogin*shdColor: grey30
+xlogin*hiColor: grey90
+xlogin*background: grey
+xlogin*inpColor: grey80
+!xlogin*foreground: darkgreen
+xlogin*greetColor: Blue3
+xlogin*failColor: red
+*Foreground: black
+*Background: #f0
+XHASHelse
+xlogin*borderWidth: 3
+xlogin*frameWidth: 0
+xlogin*innerFramesWidth: 1
+xlogin*shdColor: black
+xlogin*hiColor: black
+XHASHendif
+XHASHif 1
+! XDM has no support fo
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: christos
Date: Wed Mar 6 03:38:30 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
Log Message:
remove trailing escape
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/xdm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.15 src/external/mit/xorg/bin/xdm/Makefile:1.16
--- src/external/mit/xorg/bin/xdm/Makefile:1.15 Tue Mar 5 20:13:38 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Tue Mar 5 22:38:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/03/06 01:13:38 christos Exp $
+# $NetBSD: Makefile,v 1.16 2019/03/06 03:38:30 christos Exp $
.include
@@ -28,7 +28,7 @@ CPPFLAGS.resource.c+= \
-DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
-DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
-DDEF_AUTH_DIR=\"${XDMVARDIR}\" \
- -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" \
+ -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\"
LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: christos
Date: Wed Mar 6 01:13:39 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
src/external/mit/xorg/bin/xdm/chooser: Makefile
Log Message:
fix build
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xdm/chooser/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.14 src/external/mit/xorg/bin/xdm/Makefile:1.15
--- src/external/mit/xorg/bin/xdm/Makefile:1.14 Tue Mar 5 03:35:35 2019
+++ src/external/mit/xorg/bin/xdm/Makefile Tue Mar 5 20:13:38 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/03/05 08:35:35 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2019/03/06 01:13:38 christos Exp $
.include
@@ -13,12 +13,12 @@ SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
.endif
-CPPFLAGS+= -DRETSIGTYPE=void
-CPPFLAGS.auth.c= -DBSD44SOCKETS
-CPPFLAGS.socket.c= -DBSD44SOCKETS
-CPPFLAGS.xdmcp.c= -DBSD44SOCKETS
-CPPFLAGS.xdmshell.c= -DHAS_VFORK
-CPPFLAGS.resource.c= \
+CPPFLAGS+= -DRETSIGTYPE=void -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
+CPPFLAGS.auth.c+= -DBSD44SOCKETS
+CPPFLAGS.socket.c+= -DBSD44SOCKETS
+CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS
+CPPFLAGS.xdmshell.c+= -DHAS_VFORK
+CPPFLAGS.resource.c+= \
-DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \
-DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \
-DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \
@@ -28,7 +28,7 @@ CPPFLAGS.resource.c= \
-DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \
-DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \
-DDEF_AUTH_DIR=\"${XDMVARDIR}\" \
- -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\"
+ -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" \
LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.3 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.4
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.3 Fri May 31 19:50:35 2013
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Tue Mar 5 20:13:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 23:50:35 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/03/06 01:13:39 christos Exp $
NOMAN= 1
@@ -6,7 +6,8 @@ NOMAN= 1
PROG= chooser
-CPPFLAGS.chooser.c= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS.chooser.c+= -DBSD44SOCKETS -DRETSIGTYPE=void
+CPPFLAGS.chooser.c+= -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H
APPDEFS=Chooser
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: mrg
Date: Tue Mar 5 08:35:35 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
src/external/mit/xorg/bin/xdm/config: Makefile
Log Message:
update for xdm 1.1.12:
- streams.c is gone (hello 2019!)
- man pages other file convert from cpp to sed processing
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/xdm/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.13 src/external/mit/xorg/bin/xdm/Makefile:1.14
--- src/external/mit/xorg/bin/xdm/Makefile:1.13 Mon Jun 17 15:58:40 2013
+++ src/external/mit/xorg/bin/xdm/Makefile Tue Mar 5 08:35:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/06/17 15:58:40 christos Exp $
+# $NetBSD: Makefile,v 1.14 2019/03/05 08:35:35 mrg Exp $
.include
@@ -6,7 +6,7 @@ PROG= xdm
SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \
error.c file.c genauth.c mitauth.c netaddr.c policy.c \
protodpy.c reset.c resource.c server.c session.c socket.c \
- streams.c util.c xdmauth.c xdmcp.c prngc.c
+ util.c xdmauth.c xdmcp.c prngc.c
.if ${MKPIC} == "no"
SRCS+= Login.c greet.c verify.c
@@ -49,14 +49,17 @@ TARGETS+= configinstall
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
-X11MANCPP= yes
-X11EXTRAMANDEFS+= -DARC4_RANDOM \
- -DCHOOSERPATH=${XDMCHOOSERPATH} \
- -DGREETERLIBPATH=${XDMGREETERLIB} \
- -DXDMDIR=${XDMDIR} \
- -DXDMXAUTHDIR=${XDMVARDIR} \
- -DXDMLOGDIR=${XDMLOGDIR} \
- -DXDMPIDDIR=${XDMPIDDIR}
+.include "../../xorg-pkg-ver.mk"
+
+X11EXTRAMANDEFS+= \
+ -e 's,ARC4_RANDOM,1,' \
+ -e 's,BINDIR,$(X11BINDIR),' \
+ -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
+ -e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \
+ -e 's,XDMDIR,$(XDMDIR),' \
+ -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
+ -e 's,XDMLOGDIR,$(XDMLOGDIR),' \
+ -e 's,XDMPIDDIR,$(XDMPIDDIR),'
.include
.include
Index: src/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.14 src/external/mit/xorg/bin/xdm/config/Makefile:1.15
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.14 Mon Feb 24 07:23:40 2014
+++ src/external/mit/xorg/bin/xdm/config/Makefile Tue Mar 5 08:35:35 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2014/02/24 07:23:40 skrll Exp $
+# $NetBSD: Makefile,v 1.15 2019/03/05 08:35:35 mrg Exp $
.include
@@ -22,29 +22,41 @@ DEFAULTVT= # defined empty
.endif
UUDECODE_FILES= NetBSD-flag.png
-CPPSCRIPTS= Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
+SEDSCRIPTS= Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
-CPPSCRIPTFLAGS_Xresources= -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
--DXDM_PIXMAP=NetBSD.xpm \
--DXDM_BWPIXMAP=NetBSD-bw.xpm
-CPPSCRIPTFLAGS_Xreset= -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR}
-CPPSCRIPTFLAGS_Xservers.ws= -DBINDIR=${X11BINDIR} -DDEFAULTVT=${DEFAULTVT}
-CPPSCRIPTFLAGS_Xsession= -DBINDIR=${X11BINDIR} \
--DMKTEMP_COMMAND=/usr/bin/mktemp \
--DSHELL_CMD=/bin/sh
-CPPSCRIPTFLAGS_Xstartup= -DBINDIR=${X11BINDIR} -DXDMCONFIGDIR=${XDMDIR} \
--DUTMP_FILE=${XDMPIDDIR}/utmp \
--DWTMP_FILE=${XDMLOGDIR}/wtmp
-CPPSCRIPTFLAGS_xdm-config= -DXDMDIR=${XDMDIR} \
--DXDMXAUTHDIR=${XDMVARDIR} \
--DXDMLOGDIR=${XDMLOGDIR} \
--DXDMPIDDIR=${XDMPIDDIR} \
--DXPM \
--DSU="su -m"
+SUFFIXES = .in
+
+.in:
+ $(TOOL_SED) \
+ -e '/ifdef XPM/d' -e '/endif \/\* XPM \*\//d' \
+ -e 's,BITMAPDIR,${X11INCDIR}/X11/pixmaps,' \
+ -e 's,XDM_PIXMAP,NetBSD.xpm,' \
+ -e 's,XDM_BWPIXMAP,NetBSD-bw.xpm,' \
+ -e 's,BINDIR,$(X11BINDIR),' \
+ -e 's,DEFAULTVT,$(DEFAULTVT),' \
+ -e 's,XDMDIR,$(XDMDIR),'
+ -e 's,XDMLOGDIR,$(XDMLOGDIR),' \
+ -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \
+ -e 's,XDMPIDDIR,$(XDMPIDDIR),' \
+ -e 's,XDMCONFIGDIR,$(XDMDIR),' \
+ -e 's,XDMSCRIPTDIR,$(XDMDIR),' \
+ -e 's,SU,su -m,' \
+ -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \
+ -e 's,SHELL_CMD,/bin/sh,' \
+ -e 's,UTMP_FILE,$(XDMPIDDIR)/utmp,' \
+ -e 's,UTMP_FLAG,-u $(XDMPIDDIR)/utmp,' \
+ -e 's,WTMP_FILE,$(XDMLOGDIR)/wtmp,' \
+ -e 's,WTMP_FLAG,-w $(XDMLOGDIR)/wtmp,' \
+ -e 's,MKTEMP_COMMAND,/usr/bin/mktemp,' \
+ -e 's,XCOMM,\#,' \
+ -e 's,XHASH,\#,' \
+ -e 's,NLBS,\\n\\,' \
+ -e 's,BS,\\,' \
+ -e 's,/\*\*/,,g'
CONFIGFILES= GiveConsole TakeConsole \
Xaccess Xservers.fs Xsession Xsetup_0 Xwilling \
- ${CPPSCRIPTS}
+ ${SEDSCRIPTS}
FILES= xorg-bw.xpm xorg.xpm \
NetBSD-bw.xpm NetBSD-inv.xpm NetBSD.xpm \
NetBSD-flag.png NetBSD-flag1.xpm NetBSD-flag2.xpm
@@ -71,7 +83,5 @@ CONFIGSYMLINKS= Xservers.ws ${XDMDIR}/X
.include "../Makefile.xdm"
-CPPSCRIPTFLAGS_xdm-config+= -DCHOOSERPATH=${XDMCHOOSERPATH}
-
.include
.include
CVS commit: src/external/mit/xorg/bin/xmore
Module Name:src
Committed By: mrg
Date: Mon Mar 4 09:25:05 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xmore: Makefile
Log Message:
add new man subdir to .PATH
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xmore/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmore/Makefile
diff -u src/external/mit/xorg/bin/xmore/Makefile:1.4 src/external/mit/xorg/bin/xmore/Makefile:1.5
--- src/external/mit/xorg/bin/xmore/Makefile:1.4 Sat Aug 14 09:26:46 2010
+++ src/external/mit/xorg/bin/xmore/Makefile Mon Mar 4 09:25:04 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/08/14 09:26:46 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/03/04 09:25:04 mrg Exp $
.include
@@ -13,7 +13,7 @@ LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXp
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} \
${LIBICE} ${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man
.include
.include
CVS commit: src/external/mit/xorg/bin/xhost
Module Name:src
Committed By: mrg
Date: Sun Mar 3 09:19:02 UTC 2019
Modified Files:
src/external/mit/xorg/bin/xhost: Makefile
Log Message:
define HAVE_INET_ATON for new xhost.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xhost/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xhost/Makefile
diff -u src/external/mit/xorg/bin/xhost/Makefile:1.3 src/external/mit/xorg/bin/xhost/Makefile:1.4
--- src/external/mit/xorg/bin/xhost/Makefile:1.3 Thu Jan 3 23:39:47 2019
+++ src/external/mit/xorg/bin/xhost/Makefile Sun Mar 3 09:19:02 2019
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2019/01/03 23:39:47 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2019/03/03 09:19:02 mrg Exp $
.include
PROG= xhost
CPPFLAGS+=${X11FLAGS.CONNECTION} -DBSD44SOCKETS
+CPPFLAGS+=-DHAVE_INET_ATON
.if (${USE_INET6} != "no")
CPPFLAGS+= -DIPv6
CVS commit: src/external/mit/xorg/bin/fonttosfnt
Module Name:src
Committed By: mrg
Date: Sun Dec 30 08:51:21 UTC 2018
Modified Files:
src/external/mit/xorg/bin/fonttosfnt: Makefile
Log Message:
add new man subdir to path.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fonttosfnt/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/fonttosfnt/Makefile
diff -u src/external/mit/xorg/bin/fonttosfnt/Makefile:1.3 src/external/mit/xorg/bin/fonttosfnt/Makefile:1.4
--- src/external/mit/xorg/bin/fonttosfnt/Makefile:1.3 Wed May 9 08:39:55 2018
+++ src/external/mit/xorg/bin/fonttosfnt/Makefile Sun Dec 30 08:51:21 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/05/09 08:39:55 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/12/30 08:51:21 mrg Exp $
.include
@@ -16,7 +16,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/
LDADD+= -lfreetype -lfontenc -lz -lm
DPADD+= ${LIBFREETYPE} ${LIBFONTENC} ${LIBZ} ${LIBM}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-format
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: maya
Date: Wed Jul 4 12:25:49 UTC 2018
Modified Files:
src/external/mit/xorg/bin/fc-cache: Makefile
src/external/mit/xorg/bin/fc-cat: Makefile
src/external/mit/xorg/bin/fc-list: Makefile
src/external/mit/xorg/bin/fc-match: Makefile
src/external/mit/xorg/bin/fc-pattern: Makefile
src/external/mit/xorg/bin/fc-query: Makefile
src/external/mit/xorg/bin/fc-scan: Makefile
src/external/mit/xorg/bin/fc-validate: Makefile
Log Message:
Claim to have getopt_long.
We do, and packages occasionally expect the long options to exist.
Pointed out while investigating
PR pkg/53425: graphics/py-matplotlib 2.2.2 import fails
(which is not fixed by this commit)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fc-cache/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-cat/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-list/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fc-match/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-pattern/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fc-query/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-scan/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-validate/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/fc-cache/Makefile
diff -u src/external/mit/xorg/bin/fc-cache/Makefile:1.3 src/external/mit/xorg/bin/fc-cache/Makefile:1.4
--- src/external/mit/xorg/bin/fc-cache/Makefile:1.3 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-cache/Makefile Wed Jul 4 12:25:48 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 12:25:48 maya Exp $
.include
@@ -6,6 +6,7 @@ PROG= fc-cache
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.fontconfig}/../include
+CPPFLAGS+= -DHAVE_GETOPT_LONG=1
LDADD+= -lfontconfig -lfreetype -lexpat
DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
Index: src/external/mit/xorg/bin/fc-cat/Makefile
diff -u src/external/mit/xorg/bin/fc-cat/Makefile:1.2 src/external/mit/xorg/bin/fc-cat/Makefile:1.3
--- src/external/mit/xorg/bin/fc-cat/Makefile:1.2 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-cat/Makefile Wed Jul 4 12:25:49 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
.include
PROG= fc-cat
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+= -DHAVE_GETOPT_LONG=1
LDADD+= -lfontconfig -lfreetype -lexpat
DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
Index: src/external/mit/xorg/bin/fc-list/Makefile
diff -u src/external/mit/xorg/bin/fc-list/Makefile:1.2 src/external/mit/xorg/bin/fc-list/Makefile:1.3
--- src/external/mit/xorg/bin/fc-list/Makefile:1.2 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-list/Makefile Wed Jul 4 12:25:49 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
.include
PROG= fc-list
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+= -DHAVE_GETOPT_LONG=1
LDADD+= -lfontconfig -lfreetype -lexpat
DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
Index: src/external/mit/xorg/bin/fc-match/Makefile
diff -u src/external/mit/xorg/bin/fc-match/Makefile:1.3 src/external/mit/xorg/bin/fc-match/Makefile:1.4
--- src/external/mit/xorg/bin/fc-match/Makefile:1.3 Fri Jan 3 20:18:45 2014
+++ src/external/mit/xorg/bin/fc-match/Makefile Wed Jul 4 12:25:49 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/01/03 20:18:45 christos Exp $
+# $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
.include
PROG= fc-match
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+= -DHAVE_GETOPT_LONG=1
LDADD+= -lfontconfig -lfreetype -lexpat -lbz2 -lz
DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBBZ2} ${LIBZ}
Index: src/external/mit/xorg/bin/fc-pattern/Makefile
diff -u src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 src/external/mit/xorg/bin/fc-pattern/Makefile:1.3
--- src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 Sun Apr 17 02:16:26 2016
+++ src/external/mit/xorg/bin/fc-pattern/Makefile Wed Jul 4 12:25:49 2018
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2016/04/17 02:16:26 nakayama Exp $
+# $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
.include
PROG= fc-pattern
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -DHAVE_GETOPT_LONG=1
LDADD+= -lfontconfig -lfreetype -lexpat
DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
Index: src/external/mit/xorg/bin/fc-query/Makefile
diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.3 src/external/mit/xorg/bin/fc-query/Makefile:1.4
---
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Wed Mar 14 06:06:40 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
build Tekparse.hin VTparse.hin normally.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.15 src/external/mit/xorg/bin/xterm/Makefile:1.16
--- src/external/mit/xorg/bin/xterm/Makefile:1.15 Thu Jul 23 09:37:59 2015
+++ src/external/mit/xorg/bin/xterm/Makefile Wed Mar 14 06:06:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/07/23 09:37:59 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2018/03/14 06:06:40 mrg Exp $
.include
@@ -12,7 +12,8 @@ SRCS= button.c charproc.c charsets.c cur
# graphics_regis.c graphics_sixel.c
# xterm.appdata.xml
-CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
+CPPFLAGS+= -I. \
+ -I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-DPROJECTROOT=${X11ROOTDIR} \
@@ -44,6 +45,12 @@ COPTS.input.c+= -Wno-error # uses XKeyco
# XXXMRG should probably build builtin_icons.h
+.SUFFIXES: .def .hin
+.def.hin:
+ ${TOOL_AWK} '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
+DPSRCS+= Tekparse.hin VTparse.hin
+CLEANFILES+= Tekparse.hin VTparse.hin
+
.include "Makefile.inc"
.include
CVS commit: src/external/mit/xorg/bin/bdftopcf
Module Name:src
Committed By: mrg
Date: Sun Mar 11 10:48:39 UTC 2018
Modified Files:
src/external/mit/xorg/bin/bdftopcf: Makefile
Log Message:
update for bdftopcf 1.4.0.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/bdftopcf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/bdftopcf/Makefile
diff -u src/external/mit/xorg/bin/bdftopcf/Makefile:1.4 src/external/mit/xorg/bin/bdftopcf/Makefile:1.5
--- src/external/mit/xorg/bin/bdftopcf/Makefile:1.4 Mon Jul 20 23:50:22 2015
+++ src/external/mit/xorg/bin/bdftopcf/Makefile Sun Mar 11 10:48:38 2018
@@ -1,11 +1,26 @@
-# $NetBSD: Makefile,v 1.4 2015/07/20 23:50:22 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/11 10:48:38 mrg Exp $
.include
PROG= bdftopcf
+SRCS= atom.c \
+ bdfread.c \
+ bdfutils.c \
+ bitmap.c \
+ bitmaputil.c \
+ bufio.c \
+ defaults.c \
+ fileio.c \
+ filewr.c \
+ fontaccel.c \
+ fontink.c \
+ pcfwrite.c \
+ private.c \
+ utilbitmap.c \
+ bdftopcf.c
-LDADD+= -lXfont -lfontenc -lfreetype -lm -lz -lbz2
-DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ} ${LIBBZ2}
+LDADD+= -lm -lz -lbz2
+DPADD+= ${LIBM} ${LIBZ} ${LIBBZ2}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xwd
Module Name:src
Committed By: mrg
Date: Sun Mar 11 09:03:04 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xwd: Makefile
Log Message:
use xorg-pkg-ver.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xwd/Makefile
diff -u src/external/mit/xorg/bin/xwd/Makefile:1.4 src/external/mit/xorg/bin/xwd/Makefile:1.5
--- src/external/mit/xorg/bin/xwd/Makefile:1.4 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xwd/Makefile Sun Mar 11 09:03:04 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/11 09:03:04 mrg Exp $
.include
@@ -14,5 +14,7 @@ DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${L
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin/xwud
Module Name:src
Committed By: mrg
Date: Sun Mar 11 08:59:52 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xwud: Makefile
Log Message:
use xorg-pkg-ver.mk
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xwud/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xwud/Makefile
diff -u src/external/mit/xorg/bin/xwud/Makefile:1.2 src/external/mit/xorg/bin/xwud/Makefile:1.3
--- src/external/mit/xorg/bin/xwud/Makefile:1.2 Wed Jul 22 08:46:51 2015
+++ src/external/mit/xorg/bin/xwud/Makefile Sun Mar 11 08:59:52 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/22 08:46:51 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/11 08:59:52 mrg Exp $
.include
@@ -10,5 +10,7 @@ DPADD+= ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Mar 11 08:46:31 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xrefresh: Makefile
src/external/mit/xorg/bin/xset: Makefile
Log Message:
use xorg-pkg-ver.mk and define HAVE_USLEEP.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xrefresh/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xset/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xrefresh/Makefile
diff -u src/external/mit/xorg/bin/xrefresh/Makefile:1.2 src/external/mit/xorg/bin/xrefresh/Makefile:1.3
--- src/external/mit/xorg/bin/xrefresh/Makefile:1.2 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xrefresh/Makefile Sun Mar 11 08:46:31 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/11 08:46:31 mrg Exp $
.include
@@ -10,5 +10,7 @@ DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.6 src/external/mit/xorg/bin/xset/Makefile:1.7
--- src/external/mit/xorg/bin/xset/Makefile:1.6 Sat Mar 3 03:34:17 2018
+++ src/external/mit/xorg/bin/xset/Makefile Sun Mar 11 08:46:31 2018
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2018/03/03 03:34:17 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/11 08:46:31 mrg Exp $
.include
PROG= xset
-CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
+CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB -DHAVE_USLEEP
LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}
CVS commit: src/external/mit/xorg/bin/xeyes
Module Name:src
Committed By: mrg
Date: Sun Mar 11 08:21:24 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xeyes: Makefile
Log Message:
look in man/ subdir for the manual
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xeyes/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xeyes/Makefile
diff -u src/external/mit/xorg/bin/xeyes/Makefile:1.1.1.1 src/external/mit/xorg/bin/xeyes/Makefile:1.2
--- src/external/mit/xorg/bin/xeyes/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xeyes/Makefile Sun Mar 11 08:21:24 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2018/03/11 08:21:24 mrg Exp $
.include
@@ -9,6 +9,7 @@ LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
CVS commit: src/external/mit/xorg/bin/ico
Module Name:src
Committed By: mrg
Date: Sun Mar 11 08:03:20 UTC 2018
Modified Files:
src/external/mit/xorg/bin/ico: Makefile
Log Message:
use xorg-pkg-ver.mk
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/ico/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/ico/Makefile
diff -u src/external/mit/xorg/bin/ico/Makefile:1.2 src/external/mit/xorg/bin/ico/Makefile:1.3
--- src/external/mit/xorg/bin/ico/Makefile:1.2 Wed Jul 22 07:58:00 2015
+++ src/external/mit/xorg/bin/ico/Makefile Sun Mar 11 08:03:20 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/22 07:58:00 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/03/11 08:03:20 mrg Exp $
.include
@@ -12,5 +12,7 @@ DPADD+= ${LIBXEXT} ${LIBX11} ${LIBPTHREA
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sat Mar 3 03:34:17 UTC 2018
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/bin/xset: Makefile
Log Message:
xfs and xset don't need libXfontcache.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xset/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.12 src/external/mit/xorg/bin/xfs/Makefile:1.13
--- src/external/mit/xorg/bin/xfs/Makefile:1.12 Fri Jul 17 17:57:11 2015
+++ src/external/mit/xorg/bin/xfs/Makefile Sat Mar 3 03:34:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $
.include
@@ -59,8 +59,8 @@ FILESNAME= config
FILESDIR= ${XFSCONFIGDIR}
-LDADD+= -lXfont -lfontenc -lXfontcache -lXext -lX11 -lfreetype -lm -lz
-DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
+LDADD+= -lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz
+DPADD+= ${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
${LIBFREETYPE} ${LIBM} ${LIBZ}
.PATH: ${XFSDIR}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.5 src/external/mit/xorg/bin/xset/Makefile:1.6
--- src/external/mit/xorg/bin/xset/Makefile:1.5 Sat Apr 16 20:52:07 2016
+++ src/external/mit/xorg/bin/xset/Makefile Sat Mar 3 03:34:17 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2018/03/03 03:34:17 mrg Exp $
.include
@@ -6,8 +6,8 @@ PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
-LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
+LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
+DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}
DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
CVS commit: src/external/mit/xorg/bin/xauth
Module Name:src
Committed By: mrg
Date: Sat Mar 4 23:23:21 UTC 2017
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
Log Message:
define HAVE_STRLCPY.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xauth/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.5 src/external/mit/xorg/bin/xauth/Makefile:1.6
--- src/external/mit/xorg/bin/xauth/Makefile:1.5 Sun Jul 13 16:35:49 2014
+++ src/external/mit/xorg/bin/xauth/Makefile Sat Mar 4 23:23:21 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2014/07/13 16:35:49 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2017/03/04 23:23:21 mrg Exp $
.include
@@ -6,6 +6,7 @@ PROG= xauth
SRCS= xauth.c gethost.c process.c parsedpy.c
CPPFLAGS+= -DRETSIGTYPE=void -DPACKAGE_VERSION=\"1.0.8\"
+CPPFLAGS+= -DHAVE_STRLCPY
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
CVS commit: src/external/mit/xorg/bin/xinput
Module Name:src
Committed By: christos
Date: Wed Jan 4 15:44:06 UTC 2017
Modified Files:
src/external/mit/xorg/bin/xinput: Makefile
Log Message:
PR/51771: Yorick Hardy: Use newer xinput features
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xinput/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xinput/Makefile
diff -u src/external/mit/xorg/bin/xinput/Makefile:1.5 src/external/mit/xorg/bin/xinput/Makefile:1.6
--- src/external/mit/xorg/bin/xinput/Makefile:1.5 Mon May 23 13:44:41 2011
+++ src/external/mit/xorg/bin/xinput/Makefile Wed Jan 4 10:44:06 2017
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.5 2011/05/23 17:44:41 dsl Exp $
+# $NetBSD: Makefile,v 1.6 2017/01/04 15:44:06 christos Exp $
.include
PROG= xinput
-SRCS= buttonmap.c feedback.c list.c property.c setint.c setmode.c \
- setptr.c state.c test.c xinput.c
+SRCS= buttonmap.c feedback.c hierarchy.c list.c property.c setcp.c setint.c \
+ setmode.c setptr.c state.c test.c test_xi2.c transform.c xinput.c
-CPPFLAGS+= -DVERSION='"1.4.0"'
+CPPFLAGS+= -DVERSION='"1.6.2"'
+CPPFLAGS+= -DHAVE_XI2 -DHAVE_XI22
-LDADD+= -lXi -lX11 -lm
+LDADD+= -lXi -lX11 -lXrandr -lXinerama -lm
DPADD+= ${LIBXI} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}}/src
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xrandr
Module Name:src
Committed By: christos
Date: Tue Jun 7 23:33:45 UTC 2016
Modified Files:
src/external/mit/xorg/bin/xrandr: Makefile
Log Message:
elide stack protector warning
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xrandr/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xrandr/Makefile
diff -u src/external/mit/xorg/bin/xrandr/Makefile:1.6 src/external/mit/xorg/bin/xrandr/Makefile:1.7
--- src/external/mit/xorg/bin/xrandr/Makefile:1.6 Fri May 31 05:14:18 2013
+++ src/external/mit/xorg/bin/xrandr/Makefile Tue Jun 7 19:33:45 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/05/31 09:14:18 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2016/06/07 23:33:45 christos Exp $
.include
@@ -12,6 +12,7 @@ CPPFLAGS+= -DVERSION=\"1.4.0\"
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-parentheses
+COPTS.xrandr.c += -Wno-stack-protector
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src Committed By: nakayama Date: Sun Apr 17 02:16:26 UTC 2016 Modified Files: src/external/mit/xorg/bin/fc-pattern: Makefile src/external/mit/xorg/bin/fc-query: Makefile Log Message: Fix NetBSD RCS keyword. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-pattern/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-query/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/fc-pattern/Makefile diff -u src/external/mit/xorg/bin/fc-pattern/Makefile:1.1 src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 --- src/external/mit/xorg/bin/fc-pattern/Makefile:1.1 Mon Jun 3 06:56:49 2013 +++ src/external/mit/xorg/bin/fc-pattern/Makefile Sun Apr 17 02:16:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.2 2016/04/17 02:16:26 nakayama Exp $ .include Index: src/external/mit/xorg/bin/fc-query/Makefile diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.2 src/external/mit/xorg/bin/fc-query/Makefile:1.3 --- src/external/mit/xorg/bin/fc-query/Makefile:1.2 Mon Jun 3 20:23:39 2013 +++ src/external/mit/xorg/bin/fc-query/Makefile Sun Apr 17 02:16:26 2016 @@ -1,4 +1,4 @@ -# $NetBSD +# $NetBSD: Makefile,v 1.3 2016/04/17 02:16:26 nakayama Exp $ .include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: nakayama
Date: Sat Apr 16 20:52:07 UTC 2016
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
src/external/mit/xorg/bin/xkill: Makefile
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
Log Message:
Use xorg-pkg-ver.mk to retrieve PACKAGE_STRING.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/smproxy/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkill/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xstdcmap/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.5 src/external/mit/xorg/bin/smproxy/Makefile:1.6
--- src/external/mit/xorg/bin/smproxy/Makefile:1.5 Sat Apr 16 16:57:06 2016
+++ src/external/mit/xorg/bin/smproxy/Makefile Sat Apr 16 20:52:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
+# $NetBSD: Makefile,v 1.6 2016/04/16 20:52:07 nakayama Exp $
.include
@@ -6,12 +6,13 @@ PROG= smproxy
SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-CPPFLAGS+= -DPACKAGE_STRING="\"smproxy 1.0.6\""
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.3 src/external/mit/xorg/bin/xkill/Makefile:1.4
--- src/external/mit/xorg/bin/xkill/Makefile:1.3 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xkill/Makefile Sat Apr 16 20:52:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.4 2016/04/16 20:52:07 nakayama Exp $
.include
@@ -7,9 +7,9 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING="\"xkill 1.0.4\""
-
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.7 src/external/mit/xorg/bin/xlsclients/Makefile:1.8
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.7 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xlsclients
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
- -DPACKAGE_STRING="\"xlsclients 1.1.3\""
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
#BUILDSYMLINKS= xlscli.man xlsclients.man
@@ -14,5 +13,7 @@ DPADD+= ${LIBXCB} ${LIBXCB_ATOM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.7 src/external/mit/xorg/bin/xrdb/Makefile:1.8
--- src/external/mit/xorg/bin/xrdb/Makefile:1.7 Wed Apr 13 22:01:55 2016
+++ src/external/mit/xorg/bin/xrdb/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2016/04/13 22:01:55 christos Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\""
+CPPFLAGS+=-DHAVE_ASPRINTF
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
@@ -13,5 +13,7 @@ DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${L
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.4 src/external/mit/xorg/bin/xset/Makefile:1.5
--- src/external/mit/xorg/bin/xset/Makefile:1.4 Sat Jul 12 20:31:04 2014
+++ src/external/mit/xorg/bin/xset/Makefile Sat Apr 16 20:52:07 2016
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
.include
PROG= xset
CPPFLAGS+=${X11F
CVS commit: src/external/mit/xorg/bin/smproxy
Module Name:src
Committed By: nakayama
Date: Sat Apr 16 16:57:06 UTC 2016
Modified Files:
src/external/mit/xorg/bin/smproxy: Makefile
Log Message:
Set PACKAGE_STRING properly.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/smproxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/smproxy/Makefile
diff -u src/external/mit/xorg/bin/smproxy/Makefile:1.4 src/external/mit/xorg/bin/smproxy/Makefile:1.5
--- src/external/mit/xorg/bin/smproxy/Makefile:1.4 Sun Jul 19 19:49:17 2015
+++ src/external/mit/xorg/bin/smproxy/Makefile Sat Apr 16 16:57:06 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/19 19:49:17 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/04/16 16:57:06 nakayama Exp $
.include
@@ -6,9 +6,7 @@ PROG= smproxy
SRCS= smproxy.c save.c
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_ASPRINTF
-
-STRING!= ${PRINT_PACKAGE_STRING}
-CPPFLAGS+= -DPACKAGE_STRING=\"${STRING}\"
+CPPFLAGS+= -DPACKAGE_STRING="\"smproxy 1.0.6\""
LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
CVS commit: src/external/mit/xorg/bin/xrdb
Module Name:src Committed By: christos Date: Wed Apr 13 22:01:55 UTC 2016 Modified Files: src/external/mit/xorg/bin/xrdb: Makefile Log Message: Fix MKSTEMP To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xrdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xrdb/Makefile diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.6 src/external/mit/xorg/bin/xrdb/Makefile:1.7 --- src/external/mit/xorg/bin/xrdb/Makefile:1.6 Sat Jul 12 16:31:04 2014 +++ src/external/mit/xorg/bin/xrdb/Makefile Wed Apr 13 18:01:55 2016 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2014/07/12 20:31:04 nakayama Exp $ +# $NetBSD: Makefile,v 1.7 2016/04/13 22:01:55 christos Exp $ .include PROG= xrdb -CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX +CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAVE_MKSTEMP # XXX CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\"" LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: src/external/mit/xorg/bin/xman
Module Name:src
Committed By: christos
Date: Wed Apr 13 21:54:25 UTC 2016
Modified Files:
src/external/mit/xorg/bin/xman: Makefile
Log Message:
We have MKSTEMP so use it!
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/bin/xman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.7 src/external/mit/xorg/bin/xman/Makefile:1.8
--- src/external/mit/xorg/bin/xman/Makefile:1.7 Mon Jul 20 19:50:23 2015
+++ src/external/mit/xorg/bin/xman/Makefile Wed Apr 13 17:54:25 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/20 23:50:23 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/04/13 21:54:25 christos Exp $
.include
@@ -6,7 +6,7 @@ PROG= xman
SRCS= ScrollByL.c handler.c man.c buttons.c help.c \
search.c globals.c main.c misc.c tkfuncs.c vendor.c
-CPPFLAGS+=${X11FLAGS.VERSION}
+CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_MKSTEMP
CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
CVS commit: src/external/mit/xorg/bin/bitmap/bmtoa
Module Name:src
Committed By: christos
Date: Wed Apr 13 21:48:21 UTC 2016
Modified Files:
src/external/mit/xorg/bin/bitmap/bmtoa: Makefile
Log Message:
We have MKSTEMP so stop using mktemp!
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/bitmap/bmtoa/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/bitmap/bmtoa/Makefile
diff -u src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.1.1.1 src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.2
--- src/external/mit/xorg/bin/bitmap/bmtoa/Makefile:1.1.1.1 Tue Jul 29 01:01:22 2008
+++ src/external/mit/xorg/bin/bitmap/bmtoa/Makefile Wed Apr 13 17:48:21 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/04/13 21:48:21 christos Exp $
NOMAN= 1
@@ -6,6 +6,7 @@ NOMAN= 1
PROG= bmtoa
+CPPFLAGS+=-DHAVE_MKSTEMP
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: christos
Date: Fri Dec 25 18:50:48 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile.inc
Log Message:
PR/50593: dieter roelants: fix unexpanded definitions in xterm(1)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/xterm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile.inc
diff -u src/external/mit/xorg/bin/xterm/Makefile.inc:1.1 src/external/mit/xorg/bin/xterm/Makefile.inc:1.2
--- src/external/mit/xorg/bin/xterm/Makefile.inc:1.1 Tue Oct 14 19:37:19 2008
+++ src/external/mit/xorg/bin/xterm/Makefile.inc Fri Dec 25 13:50:48 2015
@@ -1,3 +1,20 @@
-# $NetBSD: Makefile.inc,v 1.1 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile.inc,v 1.2 2015/12/25 18:50:48 christos Exp $
-X11EXTRAMANDEFS+= -e 's,__mansuffix__,1,g'
+VERSION_H= ${X11SRCDIR.xterm}/version.h
+XTERM_DATE= ${:!${TOOL_GREP} XTERM_DATE ${VERSION_H}!:C/^[^0-9]*//}
+XTERM_PATCH= ${:!${TOOL_GREP} XTERM_PATCH ${VERSION_H}!:C/^[^0-9]*//}
+
+X11EXTRAMANDEFS+= \
+ -e 's,__app_version__,Patch \#${XTERM_PATCH},g' \
+ -e 's,__app_date__,${XTERM_DATE},g' \
+ -e 's,__default_termname__,xterm,g' \
+ -e 's,__default_termid__,420,g' \
+ -e 's,__alt_sends_esc__,False,g' \
+ -e 's,__meta_sends_esc__,False,g' \
+ -e 's,__backarrow_is_bs__,True,g' \
+ -e 's,__backarrow_is_erase__,False,g' \
+ -e 's,__delete_is_del__,Maybe,g' \
+ -e 's,__initial_erase__,False,g' \
+ -e 's,__default_class__,XTerm,g' \
+ -e 's,__mansuffix__,1,g' \
+ -e 's,__pixmapsdir__,${X11INCDIR}/X11/pixmaps,g'
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Thu Jul 23 09:38:00 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
remove some duplication; pointed out by pgoyette.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.14 src/external/mit/xorg/bin/xterm/Makefile:1.15
--- src/external/mit/xorg/bin/xterm/Makefile:1.14 Thu Jul 23 05:45:09 2015
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Jul 23 09:37:59 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/07/23 05:45:09 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2015/07/23 09:37:59 mrg Exp $
.include
@@ -31,7 +31,7 @@ BUILDSYMLINKS= XTerm-col.ad XTerm-color.
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA}
LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Thu Jul 23 07:34:38 UTC 2015
Added Files:
src/external/mit/xorg/bin/rstart: Makefile Makefile.rstart
src/external/mit/xorg/bin/rstart/commands: Makefile
src/external/mit/xorg/bin/rstart/commands/x11r6: Makefile
src/external/mit/xorg/bin/rstart/contexts: Makefile
src/external/mit/xorg/bin/showfont: Makefile
Log Message:
copy reachovers and mostly update for modern xorg. showfont builds
but rstart doesn't quite yet...
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/Makefile \
src/external/mit/xorg/bin/rstart/Makefile.rstart
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/commands/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/rstart/contexts/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/showfont/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/bin/rstart/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,41 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include
+
+PROG= rstartd.real
+SRCS= auth.c server.c
+RSTARTDBINDIR= ${X11ROOTDIR}/libexec
+RSTARTCONFIGDIR= ${X11ETCDIR}/rstart
+
+CPPFLAGS.server.c= -DSERVERNAME=\"rstartd\" \
+ -DDEFAULT_CONFIG=\"${RSTARTCONFIGDIR}/config\"
+
+MAN= rstart.1 rstartd.1
+
+X11EXTRAMANDEFS+= -e 's,RSTARTCONFIGDIR,${RSTARTCONFIGDIR},g'
+
+SEDCMD= sed -e 's/@RSH@/ssh/' -e 's/@rstartdir@/${RSTARTCONFIGDIR}/'
+
+rstart: rstart.in
+ ${SEDCMD} < ${.IMPSRC} > ${.TARGET}
+rstartd: rstartd.in
+ ${SEDCMD} < ${.IMPSRC} > ${.TARGET}
+config: config.in
+ ${SEDCMD} < ${.IMPSRC} > ${.TARGET}
+
+SCRIPTS= rstart rstartd
+SCRIPTSDIR= ${X11BINDIR}
+CONFIGFILES= config
+FILESDIR= ${RSTARTCONFIGDIR}
+
+SUBDIR= commands contexts
+TARGETS+= configinstall
+
+.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+.PATH: ${X11SRCDIR.${PROG}}/scripts
+
+.include
+BINDIR= ${RSTARTDBINDIR}
+.include
+.include
Index: src/external/mit/xorg/bin/rstart/Makefile.rstart
diff -u /dev/null src/external/mit/xorg/bin/rstart/Makefile.rstart:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/Makefile.rstart Thu Jul 23 07:34:38 2015
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.rstart,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include
+
+.PATH: ${X11SRCDIR.rstart}/${CFDIR}
+FILESDIR= ${X11ETCDIR}/rstart/${CFDIR}
+
+.for _F in ${CFFILES}
+${_F}.sed: ${_F}
+ ${_MKTARGET_CREATE}
+ rm -f ${.TARGET}
+ ${TOOL_SED} ${CFSED} < ${.ALLSRC} > ${.TARGET}
+
+CONFIGFILES+= ${_F}.sed
+CLEANFILES+= ${_F}.sed
+FILESNAME_${_F}.sed= ${_F}
+.endfor
+
+TARGETS+= configinstall
+
+realall: ${CONFIGFILES}
Index: src/external/mit/xorg/bin/rstart/commands/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/commands/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/commands/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include
+
+CFDIR= commands
+CFFILES= @List ListContexts ListGenericCommands
+CFSED= -e 's,ENVPREFIX,RSTART,g'
+
+CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \
+ x11r6 ${FILESDIR}/x11 \
+
+SUBDIR= x11r6
+
+.include "../Makefile.rstart"
+
+.include
+.include
+.include
Index: src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/commands/x11r6/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+.include
+
+CFDIR= commands/x11r6
+CFFILES= @List LoadMonitor Terminal
+CFSED= -e 's,ENVPREFIX,RSTART,g'
+
+.include "../../Makefile.rstart"
+
+.include
+.include
Index: src/external/mit/xorg/bin/rstart/contexts/Makefile
diff -u /dev/null src/external/mit/xorg/bin/rstart/contexts/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/rstart/contexts/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile,v 1.1 2015/07/23 07:34:38 mrg Exp $
+
+CFDIR= contexts
+CFFILES= @List default x11r6
+CFSED= -e 's,_PATH,/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR},g' \
+ -e 's,_MANPATH,${X11MANDIR}:/usr/man,g'
+
+CONFIGSYMLINKS= x11r6 ${FILESDIR}/x \
+ x11r6 ${FILESDIR}/x11 \
+
+.include "../Makefile.rstart"
+
+.include
+.include
Index: src/external/mit/xorg/bin/showfont/Makefile
diff -u /dev/null src/external/mit/xorg/bin/showfont/Makefile:1.1
--- /dev/null Thu Jul 23 07:34:38 2015
+++ src/external/mit/xorg/bin/showfont/Makefile Thu Jul 23 07:34:38 2015
@@ -0,0 +1,16 @@
+# $NetBS
CVS commit: src/external/mit/xorg/bin/missing-apps
Module Name:src Committed By: mrg Date: Thu Jul 23 07:33:34 UTC 2015 Removed Files: src/external/mit/xorg/bin/missing-apps/dpsexec: Makefile src/external/mit/xorg/bin/missing-apps/dpsinfo: Makefile src/external/mit/xorg/bin/missing-apps/gccmakedep: Makefile src/external/mit/xorg/bin/missing-apps/lndir: Makefile src/external/mit/xorg/bin/missing-apps/makepsres: Makefile src/external/mit/xorg/bin/missing-apps/mkcfm: Makefile src/external/mit/xorg/bin/missing-apps/pswrap: Makefile src/external/mit/xorg/bin/missing-apps/rman: Makefile src/external/mit/xorg/bin/missing-apps/rstart: Makefile Makefile.rstart src/external/mit/xorg/bin/missing-apps/rstart/commands: Makefile src/external/mit/xorg/bin/missing-apps/rstart/commands/x11r6: Makefile src/external/mit/xorg/bin/missing-apps/rstart/contexts: Makefile src/external/mit/xorg/bin/missing-apps/scripts: Makefile src/external/mit/xorg/bin/missing-apps/showfont: Makefile src/external/mit/xorg/bin/missing-apps/texteroids: Makefile Log Message: delete obsolete reachovers. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/dpsexec/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/dpsinfo/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/gccmakedep/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/lndir/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/makepsres/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/mkcfm/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/pswrap/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rman/Makefile cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/bin/missing-apps/rstart/Makefile \ src/external/mit/xorg/bin/missing-apps/rstart/Makefile.rstart cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/commands/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/commands/x11r6/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/rstart/contexts/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/scripts/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/showfont/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/bin/missing-apps/texteroids/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Thu Jul 23 05:45:09 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
link against Xinerama now that xterm 318 would prefer to.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.13 src/external/mit/xorg/bin/xterm/Makefile:1.14
--- src/external/mit/xorg/bin/xterm/Makefile:1.13 Fri Jul 11 19:40:52 2014
+++ src/external/mit/xorg/bin/xterm/Makefile Thu Jul 23 05:45:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/07/11 19:40:52 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2015/07/23 05:45:09 mrg Exp $
.include
@@ -31,9 +31,10 @@ BUILDSYMLINKS= XTerm-col.ad XTerm-color.
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
-DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
+DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA}
+LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
+DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
SUBDIR= resize uxterm
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Wed Jul 22 08:46:51 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xmessage: Makefile
src/external/mit/xorg/bin/xwud: Makefile
Log Message:
updates for xmessage 1.0.4 and xwud 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmessage/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xwud/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmessage/Makefile
diff -u src/external/mit/xorg/bin/xmessage/Makefile:1.3 src/external/mit/xorg/bin/xmessage/Makefile:1.4
--- src/external/mit/xorg/bin/xmessage/Makefile:1.3 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xmessage/Makefile Wed Jul 22 08:46:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/22 08:46:51 mrg Exp $
.include
@@ -12,6 +12,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.PATH: ${X11SRCDIR.${PROG}}/app-defaults
.include
Index: src/external/mit/xorg/bin/xwud/Makefile
diff -u src/external/mit/xorg/bin/xwud/Makefile:1.1.1.1 src/external/mit/xorg/bin/xwud/Makefile:1.2
--- src/external/mit/xorg/bin/xwud/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xwud/Makefile Wed Jul 22 08:46:51 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/22 08:46:51 mrg Exp $
.include
@@ -8,6 +8,7 @@ LDADD+= -lX11
DPADD+= ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Wed Jul 22 08:35:26 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfsinfo: Makefile
src/external/mit/xorg/bin/xkbevd: Makefile
Log Message:
updates for xfsinfo 1.0.5 and xkbevd 1.1.4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xfsinfo/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkbevd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfsinfo/Makefile
diff -u src/external/mit/xorg/bin/xfsinfo/Makefile:1.2 src/external/mit/xorg/bin/xfsinfo/Makefile:1.3
--- src/external/mit/xorg/bin/xfsinfo/Makefile:1.2 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xfsinfo/Makefile Wed Jul 22 08:35:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/22 08:35:26 mrg Exp $
.include
@@ -10,5 +10,7 @@ DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xkbevd/Makefile
diff -u src/external/mit/xorg/bin/xkbevd/Makefile:1.2 src/external/mit/xorg/bin/xkbevd/Makefile:1.3
--- src/external/mit/xorg/bin/xkbevd/Makefile:1.2 Thu Feb 17 23:50:18 2011
+++ src/external/mit/xorg/bin/xkbevd/Makefile Wed Jul 22 08:35:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/02/17 23:50:18 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/22 08:35:26 mrg Exp $
.include
@@ -8,11 +8,15 @@ SRCS= xkbevd.c cfgscan.c cfgparse.y evar
CPPFLAGS+=-DDFLT_XKB_CONFIG_ROOT='"${X11ROOTDIR}/lib/X11/xkb"'
CPPFLAGS+=-DDFLT_SOUND_CMD='"/usr/bin/audioplay"'
CPPFLAGS+=-DDFLT_SOUND_DIR='"${X11ROOTDIR}/share/sounds/"'
+CPPFLAGS+=-DHAVE_STRCASECMP
CPPFLAGS+=-I${X11SRCDIR.${PROG}}
LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+.include "../../xorg-pkg-ver.mk"
.include
.include
CVS commit: src/external/mit/xorg/bin/xlsfonts
Module Name:src
Committed By: mrg
Date: Mon Jul 20 03:12:57 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xlsfonts: Makefile
Log Message:
use xorg-pkg-ver.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlsfonts/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsfonts/Makefile
diff -u src/external/mit/xorg/bin/xlsfonts/Makefile:1.2 src/external/mit/xorg/bin/xlsfonts/Makefile:1.3
--- src/external/mit/xorg/bin/xlsfonts/Makefile:1.2 Sun Jul 19 23:15:05 2015
+++ src/external/mit/xorg/bin/xlsfonts/Makefile Mon Jul 20 03:12:57 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/07/19 23:15:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/20 03:12:57 mrg Exp $
.include
@@ -13,5 +13,7 @@ DPADD+= ${LIBXEXT} ${LIBX11}
COPTS.xlsfonts.c+= -Wno-error
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Jul 19 23:15:06 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xlsatoms: Makefile
src/external/mit/xorg/bin/xlsfonts: Makefile
src/external/mit/xorg/bin/xman: Makefile
src/external/mit/xorg/bin/xmh: Makefile
src/external/mit/xorg/bin/xmodmap: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
Log Message:
build updates for xlsatoms 1.1.2, xlsfonts 1.0.4, xman 1.1.4, xmh 1.0.03
xmodmap 1.0.9 and xvinfo 1.1.3.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xlsatoms/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsfonts/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xman/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xmh/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xmodmap/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xvinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsatoms/Makefile
diff -u src/external/mit/xorg/bin/xlsatoms/Makefile:1.3 src/external/mit/xorg/bin/xlsatoms/Makefile:1.4
--- src/external/mit/xorg/bin/xlsatoms/Makefile:1.3 Fri May 31 08:01:59 2013
+++ src/external/mit/xorg/bin/xlsatoms/Makefile Sun Jul 19 23:15:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 23:15:05 mrg Exp $
.include
@@ -10,5 +10,7 @@ DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xlsfonts/Makefile
diff -u src/external/mit/xorg/bin/xlsfonts/Makefile:1.1.1.1 src/external/mit/xorg/bin/xlsfonts/Makefile:1.2
--- src/external/mit/xorg/bin/xlsfonts/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xlsfonts/Makefile Sun Jul 19 23:15:05 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 23:15:05 mrg Exp $
.include
@@ -9,6 +9,9 @@ LDADD+= -lXext -lX11
DPADD+= ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
+
+COPTS.xlsfonts.c+= -Wno-error
.include
.include
Index: src/external/mit/xorg/bin/xman/Makefile
diff -u src/external/mit/xorg/bin/xman/Makefile:1.5 src/external/mit/xorg/bin/xman/Makefile:1.6
--- src/external/mit/xorg/bin/xman/Makefile:1.5 Sat Jul 23 06:06:40 2011
+++ src/external/mit/xorg/bin/xman/Makefile Sun Jul 19 23:15:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/07/23 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2015/07/19 23:15:06 mrg Exp $
.include
@@ -9,7 +9,7 @@ SRCS= ScrollByL.c handler.c man.c button
CPPFLAGS+=${X11FLAGS.VERSION}
CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
-CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
+#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
APPDEFS=Xman
@@ -22,5 +22,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xmh/Makefile
diff -u src/external/mit/xorg/bin/xmh/Makefile:1.6 src/external/mit/xorg/bin/xmh/Makefile:1.7
--- src/external/mit/xorg/bin/xmh/Makefile:1.6 Thu Aug 11 23:15:36 2011
+++ src/external/mit/xorg/bin/xmh/Makefile Sun Jul 19 23:15:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:36 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2015/07/19 23:15:06 mrg Exp $
.include
@@ -19,6 +19,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-format
Index: src/external/mit/xorg/bin/xmodmap/Makefile
diff -u src/external/mit/xorg/bin/xmodmap/Makefile:1.4 src/external/mit/xorg/bin/xmodmap/Makefile:1.5
--- src/external/mit/xorg/bin/xmodmap/Makefile:1.4 Mon Mar 17 10:11:27 2014
+++ src/external/mit/xorg/bin/xmodmap/Makefile Sun Jul 19 23:15:06 2015
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2014/03/17 10:11:27 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
.include
PROG= xmodmap
SRCS= xmodmap.c pf.c handle.c exec.c
-CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+= -DHAVE_ASPRINTF -DHAVE_STRNCASECMP
LDADD+= -lX11
DPADD+= ${LIBX11}
@@ -15,5 +15,7 @@ DPADD+= ${LIBX11}
COPTS.handle.c+=-Wno-error # uses XKeycodeToKeysym
COPTS.exec.c+= -Wno-error # uses XKeycodeToKeysym
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.4 src/external/mit/xorg/bin/xvinfo/Makefile:1.5
--
CVS commit: src/external/mit/xorg/bin/xfindproxy
Module Name:src
Committed By: mrg
Date: Sun Jul 19 22:43:26 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xfindproxy: Makefile
Log Message:
update for xfindproxy 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xfindproxy/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfindproxy/Makefile
diff -u src/external/mit/xorg/bin/xfindproxy/Makefile:1.1.1.1 src/external/mit/xorg/bin/xfindproxy/Makefile:1.2
--- src/external/mit/xorg/bin/xfindproxy/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xfindproxy/Makefile Sun Jul 19 22:43:26 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 22:43:26 mrg Exp $
.include
@@ -9,5 +9,7 @@ DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LI
.PATH: ${X11SRCDIR.${PROG}}
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Jul 19 22:42:25 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xgamma: Makefile
src/external/mit/xorg/bin/xkbprint: Makefile
Log Message:
updates for xgamma 1.0.6 and xkbprint 1.0.4.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xgamma/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xkbprint/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xgamma/Makefile
diff -u src/external/mit/xorg/bin/xgamma/Makefile:1.2 src/external/mit/xorg/bin/xgamma/Makefile:1.3
--- src/external/mit/xorg/bin/xgamma/Makefile:1.2 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xgamma/Makefile Sun Jul 19 22:42:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/19 22:42:24 mrg Exp $
.include
@@ -11,5 +11,7 @@ DPADD+= ${LIBXXF86VM} ${LIBXAW} ${LIBXMU
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xkbprint/Makefile
diff -u src/external/mit/xorg/bin/xkbprint/Makefile:1.1.1.1 src/external/mit/xorg/bin/xkbprint/Makefile:1.2
--- src/external/mit/xorg/bin/xkbprint/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xkbprint/Makefile Sun Jul 19 22:42:24 2015
@@ -1,17 +1,21 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2015/07/19 22:42:24 mrg Exp $
.include
PROG= xkbprint
SRCS= xkbprint.c utils.c psgeom.c
+CPPFLAGS+= -DHAVE_ASPRINTF
+
LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
# XXX
CPPFLAGS.psgeom.c+= -Wno-error
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Sun Jul 19 22:30:58 UTC 2015
Modified Files:
src/external/mit/xorg/bin/setxkbmap: Makefile
src/external/mit/xorg/bin/xcmsdb: Makefile
Log Message:
use xorg-pkg-ver.mk to provide PACKAGE_*.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/setxkbmap/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xcmsdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/setxkbmap/Makefile
diff -u src/external/mit/xorg/bin/setxkbmap/Makefile:1.3 src/external/mit/xorg/bin/setxkbmap/Makefile:1.4
--- src/external/mit/xorg/bin/setxkbmap/Makefile:1.3 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/setxkbmap/Makefile Sun Jul 19 22:30:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 22:30:58 mrg Exp $
.include
@@ -15,5 +15,7 @@ DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX1
X11EXTRAMANDEFS+= -e 's,__xkbconfigroot__,${X11LIBDIR}/xkb,g'
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
Index: src/external/mit/xorg/bin/xcmsdb/Makefile
diff -u src/external/mit/xorg/bin/xcmsdb/Makefile:1.2 src/external/mit/xorg/bin/xcmsdb/Makefile:1.3
--- src/external/mit/xorg/bin/xcmsdb/Makefile:1.2 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xcmsdb/Makefile Sun Jul 19 22:30:58 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/19 22:30:58 mrg Exp $
.include
@@ -11,5 +11,7 @@ DPADD+= ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include
.include
CVS commit: src/external/mit/xorg/bin/xcalc
Module Name:src
Committed By: mrg
Date: Sun Jul 19 08:49:50 UTC 2015
Modified Files:
src/external/mit/xorg/bin/xcalc: Makefile
Log Message:
define HAVE_STRLCPY.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xcalc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xcalc/Makefile
diff -u src/external/mit/xorg/bin/xcalc/Makefile:1.3 src/external/mit/xorg/bin/xcalc/Makefile:1.4
--- src/external/mit/xorg/bin/xcalc/Makefile:1.3 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xcalc/Makefile Sun Jul 19 08:49:50 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/19 08:49:50 mrg Exp $
.include
@@ -11,6 +11,8 @@ LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXp
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+CPPFLAGS+= -DHAVE_STRLCPY
+
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/iceauth
Module Name:src
Committed By: mrg
Date: Fri Jul 17 08:29:31 UTC 2015
Modified Files:
src/external/mit/xorg/bin/iceauth: Makefile
Log Message:
look for config.h now it is needed.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/iceauth/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/iceauth/Makefile
diff -u src/external/mit/xorg/bin/iceauth/Makefile:1.2 src/external/mit/xorg/bin/iceauth/Makefile:1.3
--- src/external/mit/xorg/bin/iceauth/Makefile:1.2 Sat Jul 23 06:41:08 2011
+++ src/external/mit/xorg/bin/iceauth/Makefile Fri Jul 17 08:29:31 2015
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.2 2011/07/23 06:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2015/07/17 08:29:31 mrg Exp $
.include
PROG= iceauth
SRCS= iceauth.c process.c
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+
LDADD+= -lICE
DPADD+= ${LIBICE}
CVS commit: src/external/mit/xorg/bin/xedit
Module Name:src Committed By: matt Date: Sat Jun 27 17:03:30 UTC 2015 Modified Files: src/external/mit/xorg/bin/xedit/lisp: Makefile src/external/mit/xorg/bin/xedit/mp: Makefile src/external/mit/xorg/bin/xedit/re: Makefile Log Message: Use LIBISPRIVATE, not MKPRIVATELIB To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xedit/lisp/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xedit/mp/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xedit/re/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xedit/lisp/Makefile diff -u src/external/mit/xorg/bin/xedit/lisp/Makefile:1.3 src/external/mit/xorg/bin/xedit/lisp/Makefile:1.4 --- src/external/mit/xorg/bin/xedit/lisp/Makefile:1.3 Thu Aug 11 23:15:35 2011 +++ src/external/mit/xorg/bin/xedit/lisp/Makefile Sat Jun 27 17:03:30 2015 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2011/08/11 23:15:35 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2015/06/27 17:03:30 matt Exp $ -MKPRIVATELIB= yes +LIBISPRIVATE= yes .include Index: src/external/mit/xorg/bin/xedit/mp/Makefile diff -u src/external/mit/xorg/bin/xedit/mp/Makefile:1.1.1.1 src/external/mit/xorg/bin/xedit/mp/Makefile:1.2 --- src/external/mit/xorg/bin/xedit/mp/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xedit/mp/Makefile Sat Jun 27 17:03:30 2015 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2015/06/27 17:03:30 matt Exp $ -MKPRIVATELIB= yes +LIBISPRIVATE= yes .include Index: src/external/mit/xorg/bin/xedit/re/Makefile diff -u src/external/mit/xorg/bin/xedit/re/Makefile:1.1.1.1 src/external/mit/xorg/bin/xedit/re/Makefile:1.2 --- src/external/mit/xorg/bin/xedit/re/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008 +++ src/external/mit/xorg/bin/xedit/re/Makefile Sat Jun 27 17:03:30 2015 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ +# $NetBSD: Makefile,v 1.2 2015/06/27 17:03:30 matt Exp $ -MKPRIVATELIB= yes +LIBISPRIVATE= yes .include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: nakayama
Date: Sat Jul 12 20:31:04 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xkill: Makefile
src/external/mit/xorg/bin/xlsclients: Makefile
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
Log Message:
Restore package names to PACKAGE_STRING.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkill/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/bin/xlsclients/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xvinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.2 src/external/mit/xorg/bin/xkill/Makefile:1.3
--- src/external/mit/xorg/bin/xkill/Makefile:1.2 Wed Mar 19 23:46:22 2014
+++ src/external/mit/xorg/bin/xkill/Makefile Sat Jul 12 20:31:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/03/19 23:46:22 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/12 20:31:04 nakayama Exp $
.include
@@ -7,7 +7,7 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING=\"1.0.4\"
+CPPFLAGS+= -DPACKAGE_STRING="\"xkill 1.0.4\""
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.6 src/external/mit/xorg/bin/xlsclients/Makefile:1.7
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.6 Mon Mar 17 09:46:10 2014
+++ src/external/mit/xorg/bin/xlsclients/Makefile Sat Jul 12 20:31:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2014/03/17 09:46:10 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2014/07/12 20:31:04 nakayama Exp $
.include
PROG= xlsclients
CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
- -DPACKAGE_STRING=\"1.1.3\"
+ -DPACKAGE_STRING="\"xlsclients 1.1.3\""
#BUILDSYMLINKS= xlscli.man xlsclients.man
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.5 src/external/mit/xorg/bin/xrdb/Makefile:1.6
--- src/external/mit/xorg/bin/xrdb/Makefile:1.5 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xrdb/Makefile Sat Jul 12 20:31:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2014/07/12 20:31:04 nakayama Exp $
.include
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING=\"1.1.0\"
+CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING="\"xrdb 1.1.0\""
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.3 src/external/mit/xorg/bin/xset/Makefile:1.4
--- src/external/mit/xorg/bin/xset/Makefile:1.3 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xset/Makefile Sat Jul 12 20:31:04 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
.include
PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
-CPPFLAGS+= -DPACKAGE_STRING=\"1.2.3\"
+CPPFLAGS+= -DPACKAGE_STRING="\"xset 1.2.3\""
LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.3 src/external/mit/xorg/bin/xvinfo/Makefile:1.4
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.3 Mon Mar 17 10:09:18 2014
+++ src/external/mit/xorg/bin/xvinfo/Makefile Sat Jul 12 20:31:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $
.include
@@ -7,7 +7,7 @@ PROG= xvinfo
LDADD+= -lXv -lXext -lX11
DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DPACKAGE_STRING=\"1.1.2\"
+CPPFLAGS+= -DPACKAGE_STRING="\"xvinfo 1.1.2\""
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Fri Jul 11 19:40:52 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
Log Message:
add comments for un-done stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/xterm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.12 src/external/mit/xorg/bin/xterm/Makefile:1.13
--- src/external/mit/xorg/bin/xterm/Makefile:1.12 Thu Mar 20 07:13:53 2014
+++ src/external/mit/xorg/bin/xterm/Makefile Fri Jul 11 19:40:52 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/03/20 07:13:53 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/07/11 19:40:52 mrg Exp $
.include
@@ -9,6 +9,9 @@ SRCS= button.c charproc.c charsets.c cur
TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
+# graphics_regis.c graphics_sixel.c
+# xterm.appdata.xml
+
CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
-I${DESTDIR}${X11INCDIR}/freetype2 \
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: riastradh
Date: Tue Jul 8 22:29:12 UTC 2014
Modified Files:
src/external/mit/xorg/bin/glxgears: Makefile
src/external/mit/xorg/bin/glxinfo: Makefile
Log Message:
Update glxinfo/glxgears reachover makefiles for mesa-demos update.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/glxgears/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/glxinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/glxgears/Makefile
diff -u src/external/mit/xorg/bin/glxgears/Makefile:1.2 src/external/mit/xorg/bin/glxgears/Makefile:1.3
--- src/external/mit/xorg/bin/glxgears/Makefile:1.2 Sun Sep 7 14:07:21 2008
+++ src/external/mit/xorg/bin/glxgears/Makefile Tue Jul 8 22:29:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/09/07 14:07:21 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2014/07/08 22:29:12 riastradh Exp $
NOMAN= # defined
@@ -11,7 +11,7 @@ CPPFLAGS+=${X11FLAGS.THREADS}
LDADD+= -lGL -lXext -lX11 -lpthread -lm
DPADD+= ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
-.PATH: ${X11SRCDIR.MesaDemos}/progs/xdemos
+.PATH: ${X11SRCDIR.MesaDemos}/src/xdemos
.include
.include
Index: src/external/mit/xorg/bin/glxinfo/Makefile
diff -u src/external/mit/xorg/bin/glxinfo/Makefile:1.3 src/external/mit/xorg/bin/glxinfo/Makefile:1.4
--- src/external/mit/xorg/bin/glxinfo/Makefile:1.3 Thu Sep 12 17:14:20 2013
+++ src/external/mit/xorg/bin/glxinfo/Makefile Tue Jul 8 22:29:12 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/09/12 17:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2014/07/08 22:29:12 riastradh Exp $
NOMAN= # defined
@@ -15,7 +15,7 @@ CPPFLAGS+=${X11FLAGS.THREADS} -DDO_GLU
LDADD+= -lGLU -lGL -lXext -lX11 -lpthread -lm
DPADD+= ${LIBGLU} ${LIBGL} ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
-.PATH: ${X11SRCDIR.MesaDemos}/progs/xdemos
+.PATH: ${X11SRCDIR.MesaDemos}/src/xdemos
.include
.include
CVS commit: src/external/mit/xorg/bin/xauth
Module Name:src
Committed By: tron
Date: Sat Apr 5 17:01:55 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
Log Message:
Force "USE_SSP" to "no" when compiling xauth(1) for now. This avoid the
program to fail with error messages like this one:
/usr/X11R7/bin/xauth: file /home/tron/.Xauthority does not exist
/usr/X11R7/bin/xauth: unable to link authority file /home/tron/.Xauthority,
use /home/tron/.Xauthority
This seems to be some weird compiler bug. If you add a debug printf(3) call
before the line in "xsrc/external/mit/xauth/dist/process.c" that calls
link(2) the target and source filename have the correct value and
the call works. Without the printf(3) call it fails.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xauth/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.3 src/external/mit/xorg/bin/xauth/Makefile:1.4
--- src/external/mit/xorg/bin/xauth/Makefile:1.3 Mon Mar 17 09:24:11 2014
+++ src/external/mit/xorg/bin/xauth/Makefile Sat Apr 5 17:01:55 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/03/17 09:24:11 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/04/05 17:01:55 tron Exp $
.include
@@ -14,5 +14,9 @@ DPADD+= ${LIBXAU} ${LIBXMUU} ${LIBXT} ${
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
+.include
+
+USE_SSP:= no
+
.include
.include
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src Committed By: mrg Date: Thu Mar 20 07:13:53 UTC 2014 Modified Files: src/external/mit/xorg/bin/xterm: Makefile Log Message: add a note about builtin_icons.h. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xterm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xterm/Makefile diff -u src/external/mit/xorg/bin/xterm/Makefile:1.11 src/external/mit/xorg/bin/xterm/Makefile:1.12 --- src/external/mit/xorg/bin/xterm/Makefile:1.11 Fri May 31 21:40:29 2013 +++ src/external/mit/xorg/bin/xterm/Makefile Thu Mar 20 07:13:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2013/05/31 21:40:29 mrg Exp $ +# $NetBSD: Makefile,v 1.12 2014/03/20 07:13:53 mrg Exp $ .include @@ -38,6 +38,8 @@ SUBDIR= resize uxterm COPTS.input.c+= -Wno-error # uses XKeycodeToKeysym +# XXXMRG should probably build builtin_icons.h + .include "Makefile.inc" .include
CVS commit: src/external/mit/xorg/bin/xkbutils
Module Name:src
Committed By: mrg
Date: Thu Mar 20 06:18:20 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xkbutils: Makefile.xkbutils
Log Message:
look for config.h.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
diff -u src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.3 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.4
--- src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.3 Wed Mar 19 23:46:22 2014
+++ src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils Thu Mar 20 06:18:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xkbutils,v 1.3 2014/03/19 23:46:22 mrg Exp $
+# $NetBSD: Makefile.xkbutils,v 1.4 2014/03/20 06:18:20 mrg Exp $
.include
@@ -8,7 +8,7 @@ LDADD+= -lxkbfile -lXaw -lXmu -lXt -lSM
DPADD+= ${LIBXKBFILE} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-CPPFLAGS+= -DHAVE_STRCASECMP
+CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.xkbutils}/../include
.PATH: ${X11SRCDIR.xkbutils} ${X11SRCDIR.xkbutils}/man
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Wed Mar 19 23:46:22 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xkbutils: Makefile.xkbutils
src/external/mit/xorg/bin/xkill: Makefile
Log Message:
find moved man pages.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xkill/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils
diff -u src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.2 src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.3
--- src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils:1.2 Mon Nov 9 00:36:12 2009
+++ src/external/mit/xorg/bin/xkbutils/Makefile.xkbutils Wed Mar 19 23:46:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xkbutils,v 1.2 2009/11/09 00:36:12 mrg Exp $
+# $NetBSD: Makefile.xkbutils,v 1.3 2014/03/19 23:46:22 mrg Exp $
.include
@@ -8,7 +8,9 @@ LDADD+= -lxkbfile -lXaw -lXmu -lXt -lSM
DPADD+= ${LIBXKBFILE} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.xkbutils}
+CPPFLAGS+= -DHAVE_STRCASECMP
+
+.PATH: ${X11SRCDIR.xkbutils} ${X11SRCDIR.xkbutils}/man
.include
.include
Index: src/external/mit/xorg/bin/xkill/Makefile
diff -u src/external/mit/xorg/bin/xkill/Makefile:1.1.1.1 src/external/mit/xorg/bin/xkill/Makefile:1.2
--- src/external/mit/xorg/bin/xkill/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xkill/Makefile Wed Mar 19 23:46:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/19 23:46:22 mrg Exp $
.include
@@ -7,7 +7,9 @@ PROG= xkill
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+CPPFLAGS+= -DPACKAGE_STRING=\"1.0.4\"
+
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
.include
.include
CVS commit: src/external/mit/xorg/bin/xmodmap
Module Name:src
Committed By: mrg
Date: Mon Mar 17 10:11:27 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xmodmap: Makefile
Log Message:
merge xmodmap 1.0.8.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xmodmap/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xmodmap/Makefile
diff -u src/external/mit/xorg/bin/xmodmap/Makefile:1.3 src/external/mit/xorg/bin/xmodmap/Makefile:1.4
--- src/external/mit/xorg/bin/xmodmap/Makefile:1.3 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/bin/xmodmap/Makefile Mon Mar 17 10:11:27 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 10:11:27 mrg Exp $
.include
PROG= xmodmap
SRCS= xmodmap.c pf.c handle.c exec.c
-CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
LDADD+= -lX11
DPADD+= ${LIBX11}
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Mon Mar 17 10:09:18 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xrdb: Makefile
src/external/mit/xorg/bin/xset: Makefile
src/external/mit/xorg/bin/xvinfo: Makefile
src/external/mit/xorg/bin/xwd: Makefile
Log Message:
merge xrdb 1.1.0, xset 1.2.3, xvinfo 1.1.2, and xwd 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xrdb/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xset/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xvinfo/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xrdb/Makefile
diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.4 src/external/mit/xorg/bin/xrdb/Makefile:1.5
--- src/external/mit/xorg/bin/xrdb/Makefile:1.4 Fri Jul 19 08:29:27 2013
+++ src/external/mit/xorg/bin/xrdb/Makefile Mon Mar 17 10:09:18 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2013/07/19 08:29:27 prlw1 Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/17 10:09:18 mrg Exp $
.include
PROG= xrdb
CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX
-CPPFLAGS+=-DHAVE_ASPRINTF
+CPPFLAGS+=-DHAVE_ASPRINTF -DPACKAGE_STRING=\"1.1.0\"
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
Index: src/external/mit/xorg/bin/xset/Makefile
diff -u src/external/mit/xorg/bin/xset/Makefile:1.2 src/external/mit/xorg/bin/xset/Makefile:1.3
--- src/external/mit/xorg/bin/xset/Makefile:1.2 Wed Aug 3 02:57:23 2011
+++ src/external/mit/xorg/bin/xset/Makefile Mon Mar 17 10:09:18 2014
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2011/08/03 02:57:23 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
.include
PROG= xset
CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
+CPPFLAGS+= -DPACKAGE_STRING=\"1.2.3\"
LDADD+= -lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
Index: src/external/mit/xorg/bin/xvinfo/Makefile
diff -u src/external/mit/xorg/bin/xvinfo/Makefile:1.2 src/external/mit/xorg/bin/xvinfo/Makefile:1.3
--- src/external/mit/xorg/bin/xvinfo/Makefile:1.2 Thu Mar 22 23:46:27 2012
+++ src/external/mit/xorg/bin/xvinfo/Makefile Mon Mar 17 10:09:18 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/03/22 23:46:27 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 10:09:18 mrg Exp $
.include
@@ -7,7 +7,9 @@ PROG= xvinfo
LDADD+= -lXv -lXext -lX11
DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
-.PATH: ${X11SRCDIR.${PROG}}
+CPPFLAGS+= -DPACKAGE_STRING=\"1.1.2\"
+
+.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
CWARNFLAGS.clang+= -Wno-dangling-else
Index: src/external/mit/xorg/bin/xwd/Makefile
diff -u src/external/mit/xorg/bin/xwd/Makefile:1.3 src/external/mit/xorg/bin/xwd/Makefile:1.4
--- src/external/mit/xorg/bin/xwd/Makefile:1.3 Fri May 31 08:02:00 2013
+++ src/external/mit/xorg/bin/xwd/Makefile Mon Mar 17 10:09:18 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 08:02:00 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 10:09:18 mrg Exp $
.include
PROG= xwd
SRCS= xwd.c clientwin.c dsimple.c list.c multiVis.c
-CPPFLAGS+=-I${X11SRCDIR./xlsfonts}
+CPPFLAGS+=-I${X11SRCDIR./xlsfonts} -DXKB
.PATH: ${X11SRCDIR./xlsfonts}
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: src/external/mit/xorg/bin/xlsclients
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:46:10 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xlsclients: Makefile
Log Message:
update for xlsclients 1.1.3.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xlsclients/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xlsclients/Makefile
diff -u src/external/mit/xorg/bin/xlsclients/Makefile:1.5 src/external/mit/xorg/bin/xlsclients/Makefile:1.6
--- src/external/mit/xorg/bin/xlsclients/Makefile:1.5 Sat Jul 23 07:11:48 2011
+++ src/external/mit/xorg/bin/xlsclients/Makefile Mon Mar 17 09:46:10 2014
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2011/07/23 07:11:48 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/17 09:46:10 mrg Exp $
.include
PROG= xlsclients
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR} -DHAVE_STRNLEN \
+ -DPACKAGE_STRING=\"1.1.3\"
#BUILDSYMLINKS= xlscli.man xlsclients.man
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:24:11 UTC 2014
Modified Files:
src/external/mit/xorg/bin/xauth: Makefile
src/external/mit/xorg/bin/xconsole: Makefile
Log Message:
updates for xauth 1.0.8 and xconsole 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xauth/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xconsole/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xauth/Makefile
diff -u src/external/mit/xorg/bin/xauth/Makefile:1.2 src/external/mit/xorg/bin/xauth/Makefile:1.3
--- src/external/mit/xorg/bin/xauth/Makefile:1.2 Sat Jul 23 06:41:08 2011
+++ src/external/mit/xorg/bin/xauth/Makefile Mon Mar 17 09:24:11 2014
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2011/07/23 06:41:08 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/03/17 09:24:11 mrg Exp $
.include
PROG= xauth
SRCS= xauth.c gethost.c process.c parsedpy.c
-CPPFLAGS+= -DRETSIGTYPE=void
+CPPFLAGS+= -DRETSIGTYPE=void -DPACKAGE_VERSION=\"1.0.8\"
CPPFLAGS.gethost.c= ${X11FLAGS.CONNECTION}
CPPFLAGS.parsedpy.c= ${X11FLAGS.CONNECTION}
Index: src/external/mit/xorg/bin/xconsole/Makefile
diff -u src/external/mit/xorg/bin/xconsole/Makefile:1.3 src/external/mit/xorg/bin/xconsole/Makefile:1.4
--- src/external/mit/xorg/bin/xconsole/Makefile:1.3 Sun May 15 21:25:33 2011
+++ src/external/mit/xorg/bin/xconsole/Makefile Mon Mar 17 09:24:11 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/05/15 21:25:33 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 09:24:11 mrg Exp $
.include
@@ -11,6 +11,7 @@ DPADD+= ${LIBUTIL} ${LIBXAW} ${LIBXMU} $
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
CPPFLAGS+=-DHAS_OPENPTY -DHAVE_UTIL_H
CVS commit: src/external/mit/xorg/bin/twm
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:21:19 UTC 2014
Modified Files:
src/external/mit/xorg/bin/twm: Makefile
Log Message:
avoid const problems for now.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/twm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/twm/Makefile
diff -u src/external/mit/xorg/bin/twm/Makefile:1.5 src/external/mit/xorg/bin/twm/Makefile:1.6
--- src/external/mit/xorg/bin/twm/Makefile:1.5 Thu Aug 11 23:15:35 2011
+++ src/external/mit/xorg/bin/twm/Makefile Mon Mar 17 09:21:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2011/08/11 23:15:35 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2014/03/17 09:21:19 mrg Exp $
.include
@@ -46,5 +46,9 @@ DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LI
CWARNFLAGS.clang+= -Wno-pointer-sign
+# XXX: has const issues best solved upstream
+COPTS.menus.c+= -Wno-error
+COPTS.util.c+= -Wno-error
+
.include
.include
CVS commit: src/external/mit/xorg/bin/makedepend
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:07:09 UTC 2014
Modified Files:
src/external/mit/xorg/bin/makedepend: Makefile
Log Message:
updates for makedepend 1.0.5.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/makedepend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/makedepend/Makefile
diff -u src/external/mit/xorg/bin/makedepend/Makefile:1.1.1.1 src/external/mit/xorg/bin/makedepend/Makefile:1.2
--- src/external/mit/xorg/bin/makedepend/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/makedepend/Makefile Mon Mar 17 09:07:09 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/17 09:07:09 mrg Exp $
.include
@@ -6,7 +6,8 @@ PROG= makedepend
SRCS= include.c main.c parse.c pr.c cppsetup.c ifparser.c
CPPFLAGS+= -I${X11SRCDIR.xc}/config/imake \
- -I${DESTDIR}${X11INCDIR}/X11
+ -I${DESTDIR}${X11INCDIR}/X11 \
+ -DHAVE_RENAME -DHAVE_FCHMOD
CPPFLAGS.main.c=-DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".o\"
CVS commit: src/external/mit/xorg/bin/mkfontscale
Module Name:src
Committed By: mrg
Date: Mon Mar 17 09:02:16 UTC 2014
Modified Files:
src/external/mit/xorg/bin/mkfontscale: Makefile
Log Message:
update for mkfontscale 1.1.1.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/mkfontscale/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/mkfontscale/Makefile
diff -u src/external/mit/xorg/bin/mkfontscale/Makefile:1.3 src/external/mit/xorg/bin/mkfontscale/Makefile:1.4
--- src/external/mit/xorg/bin/mkfontscale/Makefile:1.3 Sat Jul 23 06:06:40 2011
+++ src/external/mit/xorg/bin/mkfontscale/Makefile Mon Mar 17 09:02:16 2014
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2011/07/23 06:06:40 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/03/17 09:02:16 mrg Exp $
.include
PROG= mkfontscale
SRCS= mkfontscale.c list.c hash.c ident.c
-CPPFLAGS+= -DFREETYPE2 -I${DESTDIR}${X11INCDIR}/freetype2 \
- -DXFREE86_FT2 -DX_BZIP2_FONT_COMPRESSION
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
LDADD+= -lfontenc -lfreetype -lz -lbz2
DPADD+= ${LIBFONTENC} ${LIBFREETYPE} ${LIBZ} ${LIBBZ2}
CVS commit: src/external/mit/xorg/bin/appres
Module Name:src
Committed By: christos
Date: Wed Jan 22 15:23:06 UTC 2014
Modified Files:
src/external/mit/xorg/bin/appres: Makefile
Log Message:
Add missing libraries for static linking
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/appres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/appres/Makefile
diff -u src/external/mit/xorg/bin/appres/Makefile:1.3 src/external/mit/xorg/bin/appres/Makefile:1.4
--- src/external/mit/xorg/bin/appres/Makefile:1.3 Fri May 31 01:41:50 2013
+++ src/external/mit/xorg/bin/appres/Makefile Wed Jan 22 10:23:06 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 05:41:50 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/22 15:23:06 christos Exp $
.include
@@ -6,8 +6,8 @@ PROG= appres
CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-LDADD+= -lXt -lSM -lICE -lXext -lX11 -lXdmcp -lXau
-DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXDMCP} ${LIBXAU}
+LDADD+= -lXt -lSM -lICE -lXext -lX11 -lxcb -lXdmcp -lXau
+DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCB} ${LIBXDMCP} ${LIBXAU}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/fc-match
Module Name:src
Committed By: christos
Date: Fri Jan 3 20:18:45 UTC 2014
Modified Files:
src/external/mit/xorg/bin/fc-match: Makefile
Log Message:
fix sun2 build. libfreetype requires -lbz2 -lz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-match/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/fc-match/Makefile
diff -u src/external/mit/xorg/bin/fc-match/Makefile:1.2 src/external/mit/xorg/bin/fc-match/Makefile:1.3
--- src/external/mit/xorg/bin/fc-match/Makefile:1.2 Mon Jun 3 16:23:39 2013
+++ src/external/mit/xorg/bin/fc-match/Makefile Fri Jan 3 15:18:45 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2014/01/03 20:18:45 christos Exp $
.include
@@ -6,8 +6,8 @@ PROG= fc-match
CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I.
-LDADD+= -lfontconfig -lfreetype -lexpat
-DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+= -lfontconfig -lfreetype -lexpat -lbz2 -lz
+DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBBZ2} ${LIBZ}
.PATH: ${X11SRCDIR.fontconfig}/${PROG}
CVS commit: src/external/mit/xorg/bin/xdpyinfo
Module Name:src
Committed By: christos
Date: Sun Sep 29 14:34:30 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdpyinfo: Makefile
Log Message:
need -lxcb
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdpyinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.5 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.6
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.5 Fri May 31 02:47:31 2013
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Sun Sep 29 10:34:30 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2013/05/31 06:47:31 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2013/09/29 14:34:30 christos Exp $
.include
@@ -10,10 +10,10 @@ CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../incl
LDADD+= -lXtst -lXi -lXrender -lXinerama -lXcomposite \
-lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
- -lX11-xcb
+ -lxcb -lX11-xcb
DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
- ${LIBX11XCB}
+ ${LIBXCB} ${LIBX11XCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xrdb
Module Name:src Committed By: prlw1 Date: Fri Jul 19 08:29:27 UTC 2013 Modified Files: src/external/mit/xorg/bin/xrdb: Makefile Log Message: Replace mrg's clean cpp+cpp_arg interface with xrdb version 420347005c to minimise upstream differences. OK wiz@ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xrdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mit/xorg/bin/xrdb/Makefile diff -u src/external/mit/xorg/bin/xrdb/Makefile:1.3 src/external/mit/xorg/bin/xrdb/Makefile:1.4 --- src/external/mit/xorg/bin/xrdb/Makefile:1.3 Mon Feb 21 04:40:55 2011 +++ src/external/mit/xorg/bin/xrdb/Makefile Fri Jul 19 08:29:27 2013 @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.3 2011/02/21 04:40:55 mrg Exp $ +# $NetBSD: Makefile,v 1.4 2013/07/19 08:29:27 prlw1 Exp $ .include PROG= xrdb -CPPFLAGS+=-DCPP="\"/usr/bin/cpp\"" -DHAS_MKSTEMP # XXX -CPPFLAGS+=-DCPP_ARGS="\"-traditional\"" +CPPFLAGS+=-DCPP="\"/usr/bin/cpp -traditional\"" -DHAS_MKSTEMP # XXX CPPFLAGS+=-DHAVE_ASPRINTF LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: christos
Date: Mon Jun 17 15:58:41 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
Removed Files:
src/external/mit/xorg/bin/xdm/greeter: Makefile
Log Message:
Remove previous; this is built in ../../lib/libXdmGreet as pointed out by
mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/bin/xdm/greeter/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.12 src/external/mit/xorg/bin/xdm/Makefile:1.13
--- src/external/mit/xorg/bin/xdm/Makefile:1.12 Sat Jun 15 21:51:29 2013
+++ src/external/mit/xorg/bin/xdm/Makefile Mon Jun 17 11:58:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/06/16 01:51:29 christos Exp $
+# $NetBSD: Makefile,v 1.13 2013/06/17 15:58:40 christos Exp $
.include
@@ -11,9 +11,6 @@ SRCS= access.c auth.c choose.c daemon.c
.if ${MKPIC} == "no"
SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
-.else
-# XXX: Perhaps always build libXdmGreet and link against that?
-SUBDIR+= greeter
.endif
CPPFLAGS+= -DRETSIGTYPE=void
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: christos
Date: Sun Jun 16 01:51:29 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile
Added Files:
src/external/mit/xorg/bin/xdm/greeter: Makefile
Log Message:
In the PIC case, build libXdmGreet; perhaps we should always build and
link against it, even in the static case?
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/xdm/greeter/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.11 src/external/mit/xorg/bin/xdm/Makefile:1.12
--- src/external/mit/xorg/bin/xdm/Makefile:1.11 Thu Jun 6 05:13:41 2013
+++ src/external/mit/xorg/bin/xdm/Makefile Sat Jun 15 21:51:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2013/06/06 09:13:41 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2013/06/16 01:51:29 christos Exp $
.include
@@ -11,6 +11,9 @@ SRCS= access.c auth.c choose.c daemon.c
.if ${MKPIC} == "no"
SRCS+= Login.c greet.c verify.c
CPPFLAGS+= -DSTATIC_GREETER_LIB
+.else
+# XXX: Perhaps always build libXdmGreet and link against that?
+SUBDIR+= greeter
.endif
CPPFLAGS+= -DRETSIGTYPE=void
@@ -42,7 +45,7 @@ LDADD+= -lpam ${PAM_STATIC_LDADD}
DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.endif
-SUBDIR= chooser config
+SUBDIR+= chooser config
TARGETS+= configinstall
.include "Makefile.xdm"
Added files:
Index: src/external/mit/xorg/bin/xdm/greeter/Makefile
diff -u /dev/null src/external/mit/xorg/bin/xdm/greeter/Makefile:1.1
--- /dev/null Sat Jun 15 21:51:29 2013
+++ src/external/mit/xorg/bin/xdm/greeter/Makefile Sat Jun 15 21:51:29 2013
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2013/06/16 01:51:29 christos Exp $
+
+NOMAN= 1
+
+.include
+
+SHLIB_MAJOR=0
+SHLIB_MINOR=0
+LIB= XdmGreet
+SRCS= Login.c greet.c verify.c
+CPPFLAGS+= -DRETSIGTYPE=void
+
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lXdmcp -lXinerama
+DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
+ ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBXDMCP} ${LIBXINERAMA}
+
+.include "../Makefile.xdm"
+
+.include
+.include
+
+.PATH: ${X11SRCDIR.xdm}/greeter
CVS commit: src/external/mit/xorg/bin/xload
Module Name:src
Committed By: christos
Date: Thu Jun 13 11:25:18 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xload: Makefile
Log Message:
We need to say we have getloadavg(3) otherwise it wants to open /dev/kmem
and it does not work since we don't install setgid kmem.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xload/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xload/Makefile
diff -u src/external/mit/xorg/bin/xload/Makefile:1.4 src/external/mit/xorg/bin/xload/Makefile:1.5
--- src/external/mit/xorg/bin/xload/Makefile:1.4 Fri May 31 04:01:59 2013
+++ src/external/mit/xorg/bin/xload/Makefile Thu Jun 13 07:25:18 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 08:01:59 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/06/13 11:25:18 christos Exp $
.include
PROG= xload
SRCS= xload.c get_load.c get_rload.c
-CPPFLAGS+=${X11FLAGS.VERSION}
+CPPFLAGS+=${X11FLAGS.VERSION} -DHAVE_GETLOADAVG
APPDEFS=XLoad
CVS commit: src/external/mit/xorg/bin/fc-pattern
Module Name:src
Committed By: mrg
Date: Mon Jun 3 06:56:49 UTC 2013
Added Files:
src/external/mit/xorg/bin/fc-pattern: Makefile
Log Message:
build pc-pattern.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/bin/fc-pattern/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/bin/fc-pattern/Makefile
diff -u /dev/null src/external/mit/xorg/bin/fc-pattern/Makefile:1.1
--- /dev/null Mon Jun 3 06:56:49 2013
+++ src/external/mit/xorg/bin/fc-pattern/Makefile Mon Jun 3 06:56:49 2013
@@ -0,0 +1,18 @@
+# $NetBSD
+
+.include
+
+PROG= fc-pattern
+
+CPPFLAGS+= -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+
+LDADD+= -lfontconfig -lfreetype -lexpat
+DPADD+= ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+
+.PATH: ${X11SRCDIR.fontconfig}/${PROG}
+
+FCARCH_DEPFILE= fc-cat.c
+.include "../../lib/fontconfig/src/Makefile.fcarch"
+
+.include
+.include
CVS commit: src/external/mit/xorg/bin/xdm/chooser
Module Name:src
Committed By: mrg
Date: Fri May 31 23:50:35 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm/chooser: Makefile
Log Message:
find the renamed app-defaults file
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xdm/chooser/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/chooser/Makefile
diff -u src/external/mit/xorg/bin/xdm/chooser/Makefile:1.2 src/external/mit/xorg/bin/xdm/chooser/Makefile:1.3
--- src/external/mit/xorg/bin/xdm/chooser/Makefile:1.2 Mon Nov 9 07:21:18 2009
+++ src/external/mit/xorg/bin/xdm/chooser/Makefile Fri May 31 23:50:35 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/11/09 07:21:18 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 23:50:35 mrg Exp $
NOMAN= 1
@@ -8,7 +8,7 @@ PROG= chooser
CPPFLAGS.chooser.c= -DBSD44SOCKETS -DRETSIGTYPE=void
-APPDEFS=Chooser.ad
+APPDEFS=Chooser
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lXdmcp -lXinerama
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
CVS commit: src/external/mit/xorg/bin/sessreg
Module Name:src
Committed By: mrg
Date: Fri May 31 23:42:48 UTC 2013
Modified Files:
src/external/mit/xorg/bin/sessreg: Makefile
Log Message:
find the moved manual
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/sessreg/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/sessreg/Makefile
diff -u src/external/mit/xorg/bin/sessreg/Makefile:1.4 src/external/mit/xorg/bin/sessreg/Makefile:1.5
--- src/external/mit/xorg/bin/sessreg/Makefile:1.4 Mon Apr 11 22:47:50 2011
+++ src/external/mit/xorg/bin/sessreg/Makefile Fri May 31 23:42:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/04/11 22:47:50 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 23:42:48 mrg Exp $
.include
@@ -16,3 +16,4 @@ X11EXTRAMANDEFS+= -e 's,__ttys_file__,/e
.include
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xdm
Module Name:src
Committed By: mrg
Date: Fri May 31 22:49:15 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm: Makefile Makefile.xdm
Log Message:
udpate for xdm 1.1.11:
- moved manuals
- moved sources
- renamed defines
- new sources
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xdm/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/xdm/Makefile.xdm
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/Makefile
diff -u src/external/mit/xorg/bin/xdm/Makefile:1.8 src/external/mit/xorg/bin/xdm/Makefile:1.9
--- src/external/mit/xorg/bin/xdm/Makefile:1.8 Tue Oct 25 16:56:23 2011
+++ src/external/mit/xorg/bin/xdm/Makefile Fri May 31 22:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/10/25 16:56:23 christos Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/31 22:49:15 mrg Exp $
.include
@@ -7,7 +7,7 @@ SRCS= access.c auth.c choose.c daemon.c
error.c file.c genauth.c mitauth.c netaddr.c policy.c \
protodpy.c reset.c resource.c server.c session.c socket.c \
streams.c util.c xdmauth.c xdmcp.c \
- Login.c greet.c verify.c
+ Login.c greet.c verify.c prngc.c
CPPFLAGS+= -DRETSIGTYPE=void
CPPFLAGS.auth.c= -DBSD44SOCKETS
@@ -41,11 +41,6 @@ DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
SUBDIR= chooser config
TARGETS+= configinstall
-.PATH: ${X11SRCDIR.${PROG}}
-.PATH: ${X11SRCDIR.${PROG}}/greeter
-
-BUILDSYMLINKS+= xdm.man.cpp xdm.man
-
.include "Makefile.xdm"
CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\"
Index: src/external/mit/xorg/bin/xdm/Makefile.xdm
diff -u src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5 src/external/mit/xorg/bin/xdm/Makefile.xdm:1.6
--- src/external/mit/xorg/bin/xdm/Makefile.xdm:1.5 Tue Oct 25 16:56:23 2011
+++ src/external/mit/xorg/bin/xdm/Makefile.xdm Fri May 31 22:49:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xdm,v 1.5 2011/10/25 16:56:23 christos Exp $
+# $NetBSD: Makefile.xdm,v 1.6 2013/05/31 22:49:15 mrg Exp $
XDMVARDIR= /var/db/xdm
XDMDIR= ${X11ETCDIR}/xdm
@@ -13,16 +13,17 @@ CPPFLAGS+= -DBINDIR=\"${X11BINDIR}\" -DX
-DFRAGILE_DEV_MEM -DARC4_RANDOM \
-DXPM -DUSE_XFT -DUSE_XINERAMA \
-UIPv6 \
- -DHAS_CRYPT \
- -DHAS_DAEMON \
- -DHAS_GETIFADDRS \
- -DHAS_IFREQ \
- -DHAS_MKSTEMP \
- -DHAS_SETPROCTITLE \
- -DHAS_SETSID \
- -DHAS_SETUSERCONTEXT \
- -DHAS_VFORK \
+ -DHAVE_SYS_PARAM_H \
+ -DHAVE_DAEMON \
+ -DHAVE_GETIFADDRS \
+ -DHAVE_MKSTEMP \
+ -DHAVE_SETPROCTITLE \
+ -DHAVE_SETUSERCONTEXT \
+ -DHAVE_ARC4RANDOM \
+ -DHAVE_SIGACTION \
+ -DHAVE_ASPRINTF \
-I${X11SRCDIR.xdm} \
+ -I${X11SRCDIR.xdm}/include \
${X11FLAGS.VERSION}
.if (${USE_PAM} != "no")
@@ -30,3 +31,8 @@ CPPFLAGS+= -DUSE_PAM
.endif
.PATH: ${X11SRCDIR.xdm}
+.PATH: ${X11SRCDIR.xdm}/xdm
+.PATH: ${X11SRCDIR.xdm}/man
+.PATH: ${X11SRCDIR.xdm}/chooser
+.PATH: ${X11SRCDIR.xdm}/greeter
+.PATH: ${X11SRCDIR.xdm}/app-defaults
CVS commit: src/external/mit/xorg/bin/xterm
Module Name:src
Committed By: mrg
Date: Fri May 31 21:40:29 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xterm: Makefile
src/external/mit/xorg/bin/xterm/resize: Makefile
Log Message:
add new version.c for xterm 293.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/bin/xterm/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xterm/resize/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xterm/Makefile
diff -u src/external/mit/xorg/bin/xterm/Makefile:1.10 src/external/mit/xorg/bin/xterm/Makefile:1.11
--- src/external/mit/xorg/bin/xterm/Makefile:1.10 Thu May 30 23:42:19 2013
+++ src/external/mit/xorg/bin/xterm/Makefile Fri May 31 21:40:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2013/05/30 23:42:19 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2013/05/31 21:40:29 mrg Exp $
.include
@@ -7,7 +7,7 @@ SRCS= button.c charproc.c charsets.c cur
fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
- wcwidth.c xutf8.c cachedGCs.c xtermcap.c
+ wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
CPPFLAGS+= -I${X11SRCDIR.${PROG}} \
-I${X11SRCDIR.${PROG}}/../include \
Index: src/external/mit/xorg/bin/xterm/resize/Makefile
diff -u src/external/mit/xorg/bin/xterm/resize/Makefile:1.3 src/external/mit/xorg/bin/xterm/resize/Makefile:1.4
--- src/external/mit/xorg/bin/xterm/resize/Makefile:1.3 Sun May 15 21:35:58 2011
+++ src/external/mit/xorg/bin/xterm/resize/Makefile Fri May 31 21:40:29 2013
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2011/05/15 21:35:58 christos Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 21:40:29 mrg Exp $
.include
PROG= resize
-SRCS= resize.c xstrings.c
+SRCS= resize.c xstrings.c version.c
CPPFLAGS+=-I${X11SRCDIR.xterm}
CPPFLAGS+=-DHAVE_TERMCAP_H
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Fri May 31 08:02:00 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xload: Makefile
src/external/mit/xorg/bin/xlogo: Makefile
src/external/mit/xorg/bin/xlsatoms: Makefile
src/external/mit/xorg/bin/xmag: Makefile
src/external/mit/xorg/bin/xmessage: Makefile
src/external/mit/xorg/bin/xrefresh: Makefile
src/external/mit/xorg/bin/xsetroot: Makefile
src/external/mit/xorg/bin/xsm: Makefile
src/external/mit/xorg/bin/xstdcmap: Makefile
src/external/mit/xorg/bin/xvidtune: Makefile
src/external/mit/xorg/bin/xwd: Makefile
Log Message:
find moved manual and app-defaults files.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xload/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlogo/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xlsatoms/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xmag/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xmessage/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xrefresh/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xsetroot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xsm/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xstdcmap/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xvidtune/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xwd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xload/Makefile
diff -u src/external/mit/xorg/bin/xload/Makefile:1.3 src/external/mit/xorg/bin/xload/Makefile:1.4
--- src/external/mit/xorg/bin/xload/Makefile:1.3 Sat Nov 20 23:47:30 2010
+++ src/external/mit/xorg/bin/xload/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/20 23:47:30 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 08:01:59 mrg Exp $
.include
@@ -14,6 +14,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xlogo/Makefile
diff -u src/external/mit/xorg/bin/xlogo/Makefile:1.2 src/external/mit/xorg/bin/xlogo/Makefile:1.3
--- src/external/mit/xorg/bin/xlogo/Makefile:1.2 Fri May 21 06:04:37 2010
+++ src/external/mit/xorg/bin/xlogo/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:37 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include
@@ -16,6 +16,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xlsatoms/Makefile
diff -u src/external/mit/xorg/bin/xlsatoms/Makefile:1.2 src/external/mit/xorg/bin/xlsatoms/Makefile:1.3
--- src/external/mit/xorg/bin/xlsatoms/Makefile:1.2 Sun Jul 18 10:42:24 2010
+++ src/external/mit/xorg/bin/xlsatoms/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/18 10:42:24 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include
@@ -8,6 +8,7 @@ LDADD+= -lxcb
DPADD+= ${LIBXCB}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xmag/Makefile
diff -u src/external/mit/xorg/bin/xmag/Makefile:1.2 src/external/mit/xorg/bin/xmag/Makefile:1.3
--- src/external/mit/xorg/bin/xmag/Makefile:1.2 Sat Aug 22 01:25:45 2009
+++ src/external/mit/xorg/bin/xmag/Makefile Fri May 31 08:01:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/08/22 01:25:45 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include
@@ -14,6 +14,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xmessage/Makefile
diff -u src/external/mit/xorg/bin/xmessage/Makefile:1.2 src/external/mit/xorg/bin/xmessage/Makefile:1.3
--- src/external/mit/xorg/bin/xmessage/Makefile:1.2 Sun Nov 21 02:33:42 2010
+++ src/external/mit/xorg/bin/xmessage/Makefile Fri May 31 08:01:59 2013
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 02:33:42 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
.include
PROG= xmessage
SRCS= xmessage.c makeform.c readfile.c
-APPDEFS=Xmessage.ad Xmessage-color.ad
+APPDEFS=Xmessage Xmessage-color
LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/app-defaults
.includ
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Fri May 31 07:22:22 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xcalc: Makefile
src/external/mit/xorg/bin/xfd: Makefile
src/external/mit/xorg/bin/xfontsel: Makefile
src/external/mit/xorg/bin/xfsinfo: Makefile
src/external/mit/xorg/bin/xgamma: Makefile
src/external/mit/xorg/bin/xgc: Makefile
src/external/mit/xorg/bin/xhost: Makefile
Log Message:
find manuals in new locations
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xcalc/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xfd/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xfontsel/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xfsinfo/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xgamma/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xgc/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xhost/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xcalc/Makefile
diff -u src/external/mit/xorg/bin/xcalc/Makefile:1.2 src/external/mit/xorg/bin/xcalc/Makefile:1.3
--- src/external/mit/xorg/bin/xcalc/Makefile:1.2 Fri May 21 06:04:36 2010
+++ src/external/mit/xorg/bin/xcalc/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
.include
@@ -12,6 +12,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xfd/Makefile
diff -u src/external/mit/xorg/bin/xfd/Makefile:1.2 src/external/mit/xorg/bin/xfd/Makefile:1.3
--- src/external/mit/xorg/bin/xfd/Makefile:1.2 Sun Nov 21 01:25:33 2010
+++ src/external/mit/xorg/bin/xfd/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 01:25:33 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
.include
@@ -16,6 +16,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xfontsel/Makefile
diff -u src/external/mit/xorg/bin/xfontsel/Makefile:1.2 src/external/mit/xorg/bin/xfontsel/Makefile:1.3
--- src/external/mit/xorg/bin/xfontsel/Makefile:1.2 Sun Nov 21 01:25:33 2010
+++ src/external/mit/xorg/bin/xfontsel/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 01:25:33 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
.include
@@ -12,6 +12,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xfsinfo/Makefile
diff -u src/external/mit/xorg/bin/xfsinfo/Makefile:1.1.1.1 src/external/mit/xorg/bin/xfsinfo/Makefile:1.2
--- src/external/mit/xorg/bin/xfsinfo/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xfsinfo/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
.include
@@ -8,6 +8,7 @@ LDADD+= -lFS
DPADD+= ${LIBFS}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xgamma/Makefile
diff -u src/external/mit/xorg/bin/xgamma/Makefile:1.1.1.1 src/external/mit/xorg/bin/xgamma/Makefile:1.2
--- src/external/mit/xorg/bin/xgamma/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xgamma/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 07:22:21 mrg Exp $
.include
@@ -9,6 +9,7 @@ DPADD+= ${LIBXXF86VM} ${LIBXAW} ${LIBXMU
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xgc/Makefile
diff -u src/external/mit/xorg/bin/xgc/Makefile:1.3 src/external/mit/xorg/bin/xgc/Makefile:1.4
--- src/external/mit/xorg/bin/xgc/Makefile:1.3 Sun Nov 21 02:33:41 2010
+++ src/external/mit/xorg/bin/xgc/Makefile Fri May 31 07:22:21 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/11/21 02:33:41 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 07:22:21 mrg Exp $
.include
@@ -16,6 +16,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/x
CVS commit: src/external/mit/xorg/bin/xditview
Module Name:src
Committed By: mrg
Date: Fri May 31 06:50:45 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xditview: Makefile
Log Message:
find newly named and relocated app defaults.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xditview/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xditview/Makefile
diff -u src/external/mit/xorg/bin/xditview/Makefile:1.2 src/external/mit/xorg/bin/xditview/Makefile:1.3
--- src/external/mit/xorg/bin/xditview/Makefile:1.2 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xditview/Makefile Fri May 31 06:50:45 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:50:45 mrg Exp $
.include
@@ -9,7 +9,7 @@ SRCS= xditview.c Dvi.c draw.c font.c lex
CPPFLAGS+= -DHAS_MKSTEMP
CPPFLAGS+= -DUSE_XFT -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
-APPDEFS=Xditview.ad Xditview-chrtr.ad
+APPDEFS=Xditview Xditview-chrtr
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
@@ -21,6 +21,7 @@ FILES= ldblarrow rdblarrow
FILESDIR=${X11INCDIR}/X11/bitmaps
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
.include
CVS commit: src/external/mit/xorg/bin/xdpyinfo
Module Name:src
Committed By: mrg
Date: Fri May 31 06:47:31 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdpyinfo: Makefile
Log Message:
convert to generated config.h. add libX11-xcb.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xdpyinfo/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdpyinfo/Makefile
diff -u src/external/mit/xorg/bin/xdpyinfo/Makefile:1.4 src/external/mit/xorg/bin/xdpyinfo/Makefile:1.5
--- src/external/mit/xorg/bin/xdpyinfo/Makefile:1.4 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xdpyinfo/Makefile Fri May 31 06:47:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/31 06:47:31 mrg Exp $
.include
@@ -6,13 +6,14 @@
PROG= xdpyinfo
-CPPFLAGS+=-DMITSHM -DXKB -DXINPUT -DXRENDER
-CPPFLAGS+=-DPANORAMIX -DXF86VIDMODE -DXFreeXDGA -DXF86MISC
+CPPFLAGS+=-I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-LDADD+= -lXtst -lXi -lXrender -lXinerama \
- -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11
-DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} \
- ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXEXT} ${LIBX11}
+LDADD+= -lXtst -lXi -lXrender -lXinerama -lXcomposite \
+ -lXxf86vm -lXxf86dga -lXxf86misc -lXext -lX11 \
+ -lX11-xcb
+DPADD+= ${LIBXTST} ${LIBXI} ${LIBXRENDER} ${LIBXINERAMA} ${LIBXCOMPOSITE} \
+ ${LIBXXF86VM} ${LIBXXF86DGA} ${LIBXXF86MISC} ${LIBXEXT} ${LIBX11} \
+ ${LIBX11XCB}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xev
Module Name:src
Committed By: mrg
Date: Fri May 31 06:47:07 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xev: Makefile
Log Message:
this needs xrandr now.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xev/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xev/Makefile
diff -u src/external/mit/xorg/bin/xev/Makefile:1.2 src/external/mit/xorg/bin/xev/Makefile:1.3
--- src/external/mit/xorg/bin/xev/Makefile:1.2 Fri May 31 06:24:05 2013
+++ src/external/mit/xorg/bin/xev/Makefile Fri May 31 06:47:07 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 06:24:05 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:47:07 mrg Exp $
.include
PROG= xev
-LDADD+= -lX11
-DPADD+= ${LIBX11}
+LDADD+= -lX11 -lXrandr
+DPADD+= ${LIBX11} ${LIBXRANDR}
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
CVS commit: src/external/mit/xorg/bin/xcutsel
Module Name:src
Committed By: mrg
Date: Fri May 31 06:46:55 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xcutsel: Makefile
Log Message:
find the new manual location.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcutsel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xcutsel/Makefile
diff -u src/external/mit/xorg/bin/xcutsel/Makefile:1.1.1.1 src/external/mit/xorg/bin/xcutsel/Makefile:1.2
--- src/external/mit/xorg/bin/xcutsel/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/xcutsel/Makefile Fri May 31 06:46:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 06:46:55 mrg Exp $
.include
@@ -9,6 +9,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.xclipboard}
+.PATH: ${X11SRCDIR.xclipboard}/man
.include
.include
CVS commit: src/external/mit/xorg/bin
Module Name:src
Committed By: mrg
Date: Fri May 31 06:24:05 UTC 2013
Modified Files:
src/external/mit/xorg/bin/oclock: Makefile
src/external/mit/xorg/bin/setxkbmap: Makefile
src/external/mit/xorg/bin/viewres: Makefile
src/external/mit/xorg/bin/xclipboard: Makefile
src/external/mit/xorg/bin/xclock: Makefile
src/external/mit/xorg/bin/xcmsdb: Makefile
src/external/mit/xorg/bin/xditview: Makefile
src/external/mit/xorg/bin/xdpyinfo: Makefile
src/external/mit/xorg/bin/xedit/xedit: Makefile
src/external/mit/xorg/bin/xev: Makefile
Log Message:
find manuals moved into man/ subdirs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/oclock/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/setxkbmap/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/viewres/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xclipboard/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/xclock/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xcmsdb/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xditview/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xdpyinfo/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xedit/xedit/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xev/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/oclock/Makefile
diff -u src/external/mit/xorg/bin/oclock/Makefile:1.2 src/external/mit/xorg/bin/oclock/Makefile:1.3
--- src/external/mit/xorg/bin/oclock/Makefile:1.2 Sun Nov 21 02:33:40 2010
+++ src/external/mit/xorg/bin/oclock/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/11/21 02:33:40 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include
@@ -11,6 +11,7 @@ LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX
DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/setxkbmap/Makefile
diff -u src/external/mit/xorg/bin/setxkbmap/Makefile:1.2 src/external/mit/xorg/bin/setxkbmap/Makefile:1.3
--- src/external/mit/xorg/bin/setxkbmap/Makefile:1.2 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/bin/setxkbmap/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/14 23:37:19 cube Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include
@@ -11,6 +11,7 @@ LDADD+= -lxkbfile -lXext -lX11
DPADD+= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}}
+.PATH: ${X11SRCDIR.${PROG}}/man
X11EXTRAMANDEFS+= -e 's,__xkbconfigroot__,${X11LIBDIR}/xkb,g'
Index: src/external/mit/xorg/bin/viewres/Makefile
diff -u src/external/mit/xorg/bin/viewres/Makefile:1.2 src/external/mit/xorg/bin/viewres/Makefile:1.3
--- src/external/mit/xorg/bin/viewres/Makefile:1.2 Fri May 21 06:04:36 2010
+++ src/external/mit/xorg/bin/viewres/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/05/21 06:04:36 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include
@@ -11,6 +11,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xclipboard/Makefile
diff -u src/external/mit/xorg/bin/xclipboard/Makefile:1.2 src/external/mit/xorg/bin/xclipboard/Makefile:1.3
--- src/external/mit/xorg/bin/xclipboard/Makefile:1.2 Mon Nov 9 00:43:39 2009
+++ src/external/mit/xorg/bin/xclipboard/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/11/09 00:43:39 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include
@@ -11,6 +11,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xclock/Makefile
diff -u src/external/mit/xorg/bin/xclock/Makefile:1.2 src/external/mit/xorg/bin/xclock/Makefile:1.3
--- src/external/mit/xorg/bin/xclock/Makefile:1.2 Mon Nov 9 00:10:47 2009
+++ src/external/mit/xorg/bin/xclock/Makefile Fri May 31 06:24:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/11/09 00:10:47 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
.include
@@ -17,6 +17,7 @@ DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${L
${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
+.PATH: ${X11SRCDIR.${PROG}}/man
.include
.include
Index: src/external/mit/xorg/bin/xcmsdb/Makefile
diff -u src/external/mit/xorg/bi
CVS commit: src/external/mit/xorg/bin/mkfontdir
Module Name:src
Committed By: mrg
Date: Fri May 31 05:42:14 UTC 2013
Modified Files:
src/external/mit/xorg/bin/mkfontdir: Makefile
Log Message:
mkfontdir was renamed to a .in using @bindir, instead of CPP. deal.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/mkfontdir/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/mkfontdir/Makefile
diff -u src/external/mit/xorg/bin/mkfontdir/Makefile:1.2 src/external/mit/xorg/bin/mkfontdir/Makefile:1.3
--- src/external/mit/xorg/bin/mkfontdir/Makefile:1.2 Fri May 31 05:24:49 2013
+++ src/external/mit/xorg/bin/mkfontdir/Makefile Fri May 31 05:42:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 05:42:14 mrg Exp $
.include
@@ -7,9 +7,10 @@
MAN= mkfontdir.1
-CPPSCRIPTS= mkfontdir
-CPPSCRIPTFLAGS= -DBINDIR=${X11BINDIR}
SCRIPTS= mkfontdir
+mkfontdir: mkfontdir.in
+ ${TOOL_SED} -e "s#@bindir@#${X11BINDIR}#" < ${.ALLSRC} > ${.TARGET}
+
.include
.include
CVS commit: src/external/mit/xorg/bin/appres
Module Name:src
Committed By: mrg
Date: Fri May 31 05:41:50 UTC 2013
Modified Files:
src/external/mit/xorg/bin/appres: Makefile
Log Message:
look for a config.h
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/appres/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/appres/Makefile
diff -u src/external/mit/xorg/bin/appres/Makefile:1.2 src/external/mit/xorg/bin/appres/Makefile:1.3
--- src/external/mit/xorg/bin/appres/Makefile:1.2 Fri May 31 05:24:49 2013
+++ src/external/mit/xorg/bin/appres/Makefile Fri May 31 05:41:50 2013
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2013/05/31 05:41:50 mrg Exp $
.include
PROG= appres
+CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+
LDADD+= -lXt -lSM -lICE -lXext -lX11 -lXdmcp -lXau
DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXDMCP} ${LIBXAU}
CVS commit: src/external/mit/xorg/bin/imake
Module Name:src
Committed By: mrg
Date: Fri May 31 05:41:26 UTC 2013
Modified Files:
src/external/mit/xorg/bin/imake: Makefile
Log Message:
add -Wno-error to work around some const issues.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/imake/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/imake/Makefile
diff -u src/external/mit/xorg/bin/imake/Makefile:1.3 src/external/mit/xorg/bin/imake/Makefile:1.4
--- src/external/mit/xorg/bin/imake/Makefile:1.3 Fri May 21 05:55:24 2010
+++ src/external/mit/xorg/bin/imake/Makefile Fri May 31 05:41:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/05/21 05:55:24 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 05:41:26 mrg Exp $
.include
@@ -13,5 +13,7 @@ X11EXTRAMANDEFS=-e 's,__cpp__,$(CPP_PROG
.PATH: ${X11SRCDIR.${PROG}}
+COPTS.imake.c+= -Wno-error # const issues
+
.include
.include
CVS commit: src/external/mit/xorg/bin/xfs
Module Name:src
Committed By: mrg
Date: Fri May 31 01:50:25 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xfs: Makefile
Log Message:
remove cache.c from SRCS list for xfs 1.1.3
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/bin/xfs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.8 src/external/mit/xorg/bin/xfs/Makefile:1.9
--- src/external/mit/xorg/bin/xfs/Makefile:1.8 Sun Nov 21 02:33:41 2010
+++ src/external/mit/xorg/bin/xfs/Makefile Fri May 31 01:50:25 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/21 02:33:41 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/31 01:50:25 mrg Exp $
.include
@@ -9,7 +9,7 @@ XFSDIR= ${X11SRCDIR.${PROG}}
.PATH: ${XFSDIR}/man
.PATH: ${XFSDIR}/difs
-SRCS= atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
+SRCS= atom.c charinfo.c difsutils.c dispatch.c events.c \
extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
resource.c swaprep.c swapreq.c tables.c
CVS commit: src/external/mit/xorg/bin/sxpm
Module Name:src
Committed By: mrg
Date: Fri May 31 01:41:56 UTC 2013
Modified Files:
src/external/mit/xorg/bin/sxpm: Makefile
Log Message:
find the relocated sxpm.man
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/sxpm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/sxpm/Makefile
diff -u src/external/mit/xorg/bin/sxpm/Makefile:1.1.1.1 src/external/mit/xorg/bin/sxpm/Makefile:1.2
--- src/external/mit/xorg/bin/sxpm/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/sxpm/Makefile Fri May 31 01:41:56 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:56 mrg Exp $
.include
@@ -11,6 +11,7 @@ LDADD+= -lXpm -lXt -lSM -lICE -lXext -lX
DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.Xpm}/${PROG}
+.PATH: ${X11SRCDIR.Xpm}/man
.include
.include
CVS commit: src/external/mit/xorg/bin/cxpm
Module Name:src
Committed By: mrg
Date: Fri May 31 01:41:08 UTC 2013
Modified Files:
src/external/mit/xorg/bin/cxpm: Makefile
Log Message:
find the relocated cxpm.1 manual.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/cxpm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/cxpm/Makefile
diff -u src/external/mit/xorg/bin/cxpm/Makefile:1.1.1.1 src/external/mit/xorg/bin/cxpm/Makefile:1.2
--- src/external/mit/xorg/bin/cxpm/Makefile:1.1.1.1 Tue Jul 29 05:01:22 2008
+++ src/external/mit/xorg/bin/cxpm/Makefile Fri May 31 01:41:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/31 01:41:08 mrg Exp $
.include
@@ -11,6 +11,7 @@ LDADD+= -lXpm -lXt -lSM -lICE -lXext -lX
DPADD+= ${LIBXPM} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11}
.PATH: ${X11SRCDIR.Xpm}/${PROG}
+.PATH: ${X11SRCDIR.Xpm}/man
.include
.include
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src
Committed By: martin
Date: Thu Feb 21 08:20:19 UTC 2013
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
Log Message:
Make the Xdm default config use vt05 for all arches that can switch
consoles while in X.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/bin/xdm/config/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.12 src/external/mit/xorg/bin/xdm/config/Makefile:1.13
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.12 Wed Jun 13 19:44:14 2012
+++ src/external/mit/xorg/bin/xdm/config/Makefile Thu Feb 21 08:20:19 2013
@@ -1,9 +1,21 @@
-# $NetBSD: Makefile,v 1.12 2012/06/13 19:44:14 martin Exp $
+# $NetBSD: Makefile,v 1.13 2013/02/21 08:20:19 martin Exp $
.include
-# native only gives DEFAULTVT for i386 and amd64.
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || ${MACHINE} == "cats"
+# DEFAULTVT for all arches that are able to switch virtual consoles
+# while in X (currently this needs WSDISPLAY_COMPAT_USL and
+# WSDISPLAY_COMPAT_PCVT, this might change soon)
+.if ${MACHINE_ARCH} == "x86_64" \
+ || ${MACHINE_ARCH} == "cats" \
+ || ${MACHINE_ARCH} == "hp700" \
+ || ${MACHINE_ARCH} == "hpcmips" \
+ || ${MACHINE_ARCH} == "hpcsh" \
+ || ${MACHINE_ARCH} == "i386" \
+ || ${MACHINE_ARCH} == "netwinder" \
+ || ${MACHINE_ARCH} == "shark" \
+ || ${MACHINE_ARCH} == "sparc" \
+ || ${MACHINE_ARCH} == "sparc64" \
+ || ${MACHINE_ARCH} == "zaurus"
DEFAULTVT=vt05
.else
DEFAULTVT= # defined empty
CVS commit: src/external/mit/xorg/bin/xdm/config
Module Name:src
Committed By: martin
Date: Wed Jun 13 19:44:14 UTC 2012
Modified Files:
src/external/mit/xorg/bin/xdm/config: Makefile
Added Files:
src/external/mit/xorg/bin/xdm/config: NetBSD-flag.png.uue
Removed Files:
src/external/mit/xorg/bin/xdm/config: NetBSD-flag.png
Log Message:
On second thought, do not store a binary file in the repository, instead
use the uuencoded version.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/bin/xdm/config/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/bin/xdm/config/NetBSD-flag.png
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/bin/xdm/config/NetBSD-flag.png.uue
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/xdm/config/Makefile
diff -u src/external/mit/xorg/bin/xdm/config/Makefile:1.11 src/external/mit/xorg/bin/xdm/config/Makefile:1.12
--- src/external/mit/xorg/bin/xdm/config/Makefile:1.11 Wed Jun 13 18:51:35 2012
+++ src/external/mit/xorg/bin/xdm/config/Makefile Wed Jun 13 19:44:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/06/13 18:51:35 martin Exp $
+# $NetBSD: Makefile,v 1.12 2012/06/13 19:44:14 martin Exp $
.include
@@ -9,6 +9,7 @@ DEFAULTVT=vt05
DEFAULTVT= # defined empty
.endif
+UUDECODE_FILES= NetBSD-flag.png
CPPSCRIPTS= Xresources Xreset Xservers.ws Xsession Xstartup xdm-config
CPPSCRIPTFLAGS_Xresources= -DXPM -DBITMAPDIR=${X11INCDIR}/X11/pixmaps \
Added files:
Index: src/external/mit/xorg/bin/xdm/config/NetBSD-flag.png.uue
diff -u /dev/null src/external/mit/xorg/bin/xdm/config/NetBSD-flag.png.uue:1.1
--- /dev/null Wed Jun 13 19:44:14 2012
+++ src/external/mit/xorg/bin/xdm/config/NetBSD-flag.png.uue Wed Jun 13 19:44:14 2012
@@ -0,0 +1,165 @@
+begin 644 NetBSD-flag.png
+MB5!.1PT*&@H-24A$4@```+D```"6"`8```""5RF_"7!(67,```L3
+M```+$P$`FIP8```*3VE#0U!0:&]T;W-H;W`@24-#('!R;V9I;&4``'C:G5-G
+M5%/I%CWWWO1"2XB`E$MO4A4((%)"BX`4D28J(0D02H@AH=D54<$1144$&\B@
+MB`..CH",%5$L#(H*V`?D(:*.@Z.(BLK[X7NC:]:\]^;-_K77/N>L\YVSSP?`
+M"`R62#-1-8`,J4(>$>"#Q\3&X>0N0($*)'``$`BS9"%S_2,!`/A^/#PK(L`'
+MO@`!>-,+"`#`39O`,!R'_P_J0IE<`8"$`,X.KL[.-HZV#E\MZK\&
+M_R)B8N/^Y<^K<$```.%T?M'^+"^S&H`[!H!M_J(E[@1H7@N@=?>+9K(/0+4`
+MH.G:5_-P^'X\/$6AD+G9V>7DY-A*Q$);8@)0"`9DF2<0``7D0D+E3*LS_'"```1*"!
+M*K!!&_3!&"S`!AS!!=S!"_Q@-H1"),3"0A!""F2`'')@*:R"0BB&S;`=*F`O
+MU$`=-,!1:(:3<`XNPE6X#CUP#_IA")[!*+R!"01!R`@382':B`%BBE@CC@@7
+MF87X(<%(!!*+)"#)B!11(DN1-4@Q4HI4(%5('?(]<@(YAUQ&NI$[R``R@OR&
+MO$?0JV@/VH\^
+M0\3#Y#/D&^0A\EL*G6)`<:3X4^(H4LIJ2AGE$.4T
+MY09EF#)!5:.:4MVHH501-8]:0JVAME*O48>H$S1UFCG-@Q9)2Z6MHI73&F@7
+M:/=IK^ATNA'=E1Y.E]!7TLOI1^B7Z`/T=PP-AA6#QXAG*!F;&`<89QEW&*^8
+M3*89TXL9QU0P-S'KF.>9#YEO55@JMBI\%9'*"I5*E2:5&RHO5*FJIJK>J@M5
+M\U7+5(^I7E-]KD95,U/CJ0G4EJM5JIU0ZU,;4V>I.ZB'JF>H;U0_I'Y9_8D&
+M6<-,PT]#I%&@L5_CO,8@"V,9LW@L(6L-JX9U@37$)K'-V7QV*KN8_1V[BSVJ
+MJ:$Y0S-*,U>S4O.49C\'XYAQ^)QT3@GG**>7\WZ*WA3O*>(I&Z8T3+DQ95QK
+MJI:7EEBK2*M1JT?KO3:N[:>=IKU%NUG[@0Y!QTHG7"='9X_.!9WG4]E3W:<*
+MIQ9-/3KUKBZJ:Z4;H;M$=[]NI^Z8GKY>@)Y,;Z?>>;WG^AQ]+_U4_6WZI_5'
+M#%@&LPPD!ML,SA@\Q35Q;SP=+\?;\5%#7<-`0Z5AE6&7X821N=$\H]5&C48/
+MC&G&7.,DXVW&;<:C)@8F(29+3>I-[II23;FF*:8[3#M,Q\W,S:+-UIDUFSTQ
+MUS+GF^>;UYO?MV!:>%HLMJBVN&5)LN1:IEGNMKQNA5HY6:5855I=LT:MG:TE
+MUKNMNZ<1I[E.DTZKGM9GP[#QMLFVJ;<9L.78!MNNMFVV?6%G8A=GM\6NP^Z3
+MO9-]NGV-_3T'#8?9#JL=6AU^<[1R%#I6.MZ:SISN/WW%]);I+V=8SQ#/V#/C
+MMA/+*<1IG5.;TT=G%V>Y1*=/5Q7>%ZTO6=
+MF[.;PNVHVZ_N-NYI[H?63-ST,/(0^!1Y=$_"Y^5,&O?K'Y/0T^!
+M9[7G(R]C+Y%7K=>PMZ5WJO=A[Q<^]CYRG^,^XSPWWC+>65_,-\"WR+?+3\-O
+MGE^%WT-_(_]D_WK_T0"G@"4!9P.)@4&!6P+[^'I\(;^./SK;9?:RV>U!C*"Y
+M015!CX*M@N7!K2%HR.R0K2'WYYC.D&
+M/XYPB%@:T3&7-7?1W$-SWT3Z1)9$WIMG,4\YKRU*-2H^JBYJ/-HWNC2Z/\8N
+M9EG,U5B=6$EL2QPY+BJN-FYLOM_\[?.'XIWB"^-[%Y@OR%UP>:'.PO2%IQ:I
+M+A(L.I9`3(A..)3P01`JJ!:,)?(3=R6."GG"'<)G(B_1-M&(V$-<*AY.\D@J
+M37J2[)&\-7DDQ3.E+.6YA">ID+Q,#4S=FSJ>%IIV(&TR/3J],8.2D9!Q0JHA
+M39.V9^IGYF9VRZQEA;+^Q6Z+MR\>E0?):[.0K`59+0JV0J;H5%HHURH'LF=E
+M5V:_S8G*.9:KGBO-[=L*XQ4%*X96!JP\N(JV*FW53ZOM5Y>N?KTF>DUK@5[!RH+!M0%KZPM5"N6%
+M?>O;>+9Y;#I:JE^:7#FX-V=JT#=]6M.WU]D7;+Y?-*-N[@[9#N:._
+M/+B\9:?)SLT[/U2D5/14^E0V[M+=M6'7^&[1[AM[O/8T[-7;6[SW_3[)OMM5
+M`55-U6;59?M)^[/W/ZZ)JNGXEOMM7:U.;7'MQP/2`_T'(PZVU[G4U1W2/512
+MC]8KZT<.QQ^^_IWO=RT--@U5C9S&XB-P1'GDZ?<)W_<>#3K:=HQ[K.$'TQ]V
+M'6<=+VI"FO*:1IM3FOM;8ENZ3\P^T=;JWGK\1]L?#YPT/%EY2O-4R6G:Z8+3
+MDV?RSXR=E9U]?B[YW&#;HK9[YV/.WVH/;^^Z$'3ATD7_B^<[O#O.7/*X=/*R
+MV^435[A7FJ\Z7VWJ=.H\_I/33\>[G+N:KKE<:[GN>KVU>V;WZ1N>-\[=]+UY
+M\1;_UM6>.3W=O?-Z;_?%]_7?%MU^@\]'<1_<&A8//_I'UCP]#!8^9C\NKGC@^.3GB/W+]
+MZ?RG0\]DSR:>%_ZB_LNN%Q8O?OC5Z]?.T9C1H9?REY._;7RE_>K`ZQFOV\;"
+MQAZ^R7@S,5[T5OOMP7?<=QWOH]\/3^1\('\H_VCYL?53T*?[DQF3D_\$`YCS
+M_&,S+=L@8TA230``>B4``("#``#Y_P``@.D``'4P``#J8```.I@``!=O
+MDE_%1@``$95)1$%4>-KL74UVVLP6+/MDS)-6$+R"R"NPO(+@Z9L81O3,9OA&
+MF!6`9\W(>`4F*["\`LLKL+("]+&![PUT%7>$I&[]`)*X=0XG"<&X?ZJKZW;?
+M;IV!<;+8CFT7@`7``?`=0)_^RRWX50&]0@`?`'P`06^Y\9M0SS/NZI,@`_`&P.LM-QZ3G%$7J?M$Z"LBM-.
CVS commit: src/external/mit/xorg/bin/x11perf
Module Name:src
Committed By: dholland
Date: Sun Nov 20 21:02:23 UTC 2011
Modified Files:
src/external/mit/xorg/bin/x11perf: Makefile
Log Message:
Add missing CLEANFILES+=x11perfcomp
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/x11perf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/x11perf/Makefile
diff -u src/external/mit/xorg/bin/x11perf/Makefile:1.2 src/external/mit/xorg/bin/x11perf/Makefile:1.3
--- src/external/mit/xorg/bin/x11perf/Makefile:1.2 Wed Aug 3 02:55:30 2011
+++ src/external/mit/xorg/bin/x11perf/Makefile Sun Nov 20 21:02:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/08/03 02:55:30 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2011/11/20 21:02:23 dholland Exp $
.include
@@ -24,6 +24,8 @@ SCRIPTSDIR_fillblnk.sh= ${X11LIBDIR}/x11
SCRIPTSDIR_perfboth.sh= ${X11LIBDIR}/x11perfcomp
SCRIPTSDIR_perfratio.sh=${X11LIBDIR}/x11perfcomp
+CLEANFILES+= x11perfcomp
+
LDADD+= -lXft -lfontconfig -lfreetype -lexpat -lXrender
DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
LDADD+= -lXmuu -lXt -lSM -lICE -lXext -lX11 -lm
