Sun Jul 19 23:15:06 2015 UTC ()
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.


(mrg)
diff -r1.3 -r1.4 src/external/mit/xorg/bin/xlsatoms/Makefile
diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsfonts/Makefile
diff -r1.5 -r1.6 src/external/mit/xorg/bin/xman/Makefile
diff -r1.6 -r1.7 src/external/mit/xorg/bin/xmh/Makefile
diff -r1.4 -r1.5 src/external/mit/xorg/bin/xmodmap/Makefile
diff -r1.4 -r1.5 src/external/mit/xorg/bin/xvinfo/Makefile
cvs diff -r1.3 -r1.4 src/external/mit/xorg/bin/xlsatoms/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xlsatoms/Makefile 2013/05/31 08:01:59 1.3
+++ src/external/mit/xorg/bin/xlsatoms/Makefile 2015/07/19 23:15:05 1.4
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1# $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $ 1# $NetBSD: Makefile,v 1.4 2015/07/19 23:15:05 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xlsatoms 5PROG= xlsatoms
6 6
7LDADD+= -lxcb 7LDADD+= -lxcb
8DPADD+= ${LIBXCB} 8DPADD+= ${LIBXCB}
9 9
10.PATH: ${X11SRCDIR.${PROG}} 10.PATH: ${X11SRCDIR.${PROG}}
11.PATH: ${X11SRCDIR.${PROG}}/man 11.PATH: ${X11SRCDIR.${PROG}}/man
12 12
 13.include "../../xorg-pkg-ver.mk"
 14
13.include <bsd.x11.mk> 15.include <bsd.x11.mk>
14.include <bsd.prog.mk> 16.include <bsd.prog.mk>
cvs diff -r1.1.1.1 -r1.2 src/external/mit/xorg/bin/xlsfonts/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xlsfonts/Makefile 2008/07/29 05:01:22 1.1.1.1
+++ src/external/mit/xorg/bin/xlsfonts/Makefile 2015/07/19 23:15:05 1.2
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ 1# $NetBSD: Makefile,v 1.2 2015/07/19 23:15:05 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xlsfonts 5PROG= xlsfonts
6SRCS= xlsfonts.c dsimple.c 6SRCS= xlsfonts.c dsimple.c
7 7
8LDADD+= -lXext -lX11 8LDADD+= -lXext -lX11
9DPADD+= ${LIBXEXT} ${LIBX11} 9DPADD+= ${LIBXEXT} ${LIBX11}
10 10
11.PATH: ${X11SRCDIR.${PROG}} 11.PATH: ${X11SRCDIR.${PROG}}
 12.PATH: ${X11SRCDIR.${PROG}}/man
 13
 14COPTS.xlsfonts.c+= -Wno-error
12 15
13.include <bsd.x11.mk> 16.include <bsd.x11.mk>
14.include <bsd.prog.mk> 17.include <bsd.prog.mk>
cvs diff -r1.5 -r1.6 src/external/mit/xorg/bin/xman/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xman/Makefile 2011/07/23 06:06:40 1.5
+++ src/external/mit/xorg/bin/xman/Makefile 2015/07/19 23:15:06 1.6
@@ -1,26 +1,28 @@ @@ -1,26 +1,28 @@
1# $NetBSD: Makefile,v 1.5 2011/07/23 06:06:40 mrg Exp $ 1# $NetBSD: Makefile,v 1.6 2015/07/19 23:15:06 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xman 5PROG= xman
6SRCS= ScrollByL.c handler.c man.c buttons.c help.c \ 6SRCS= ScrollByL.c handler.c man.c buttons.c help.c \
7 search.c globals.c main.c misc.c tkfuncs.c vendor.c 7 search.c globals.c main.c misc.c tkfuncs.c vendor.c
8 8
9CPPFLAGS+=${X11FLAGS.VERSION} 9CPPFLAGS+=${X11FLAGS.VERSION}
10CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\" 10CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
11CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\" 11CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
12CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include 12#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
13 13
14APPDEFS=Xman 14APPDEFS=Xman
15 15
16FILES= xman.help 16FILES= xman.help
17FILESDIR=${X11LIBDIR} 17FILESDIR=${X11LIBDIR}
18 18
19LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 19LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
20DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ 20DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
21 ${LIBXPM} ${LIBXEXT} ${LIBX11} 21 ${LIBXPM} ${LIBXEXT} ${LIBX11}
22 22
23.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man 23.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults ${X11SRCDIR.${PROG}}/man
24 24
 25.include "../../xorg-pkg-ver.mk"
 26
25.include <bsd.x11.mk> 27.include <bsd.x11.mk>
26.include <bsd.prog.mk> 28.include <bsd.prog.mk>
cvs diff -r1.6 -r1.7 src/external/mit/xorg/bin/xmh/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xmh/Makefile 2011/08/11 23:15:36 1.6
+++ src/external/mit/xorg/bin/xmh/Makefile 2015/07/19 23:15:06 1.7
@@ -1,26 +1,27 @@ @@ -1,26 +1,27 @@
1# $NetBSD: Makefile,v 1.6 2011/08/11 23:15:36 joerg Exp $ 1# $NetBSD: Makefile,v 1.7 2015/07/19 23:15:06 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xmh 5PROG= xmh
6SRCS= bbox.c command.c compfuncs.c folder.c init.c main.c \ 6SRCS= bbox.c command.c compfuncs.c folder.c init.c main.c \
7 menu.c mlist.c msg.c pick.c popup.c screen.c toc.c \ 7 menu.c mlist.c msg.c pick.c popup.c screen.c toc.c \
8 tocfuncs.c tocutil.c tsource.c util.c viewfuncs.c \ 8 tocfuncs.c tocutil.c tsource.c util.c viewfuncs.c \
9 miscfuncs.c 9 miscfuncs.c
10 10
11CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include 11CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include
12CPPFLAGS+= -DHAS_VFORK -DXVENDORNAME=${XVENDORNAME} \ 12CPPFLAGS+= -DHAS_VFORK -DXVENDORNAME=${XVENDORNAME} \
13 -DXORG_RELEASE=${XORG_RELEASE} 13 -DXORG_RELEASE=${XORG_RELEASE}
14 14
15APPDEFS=Xmh 15APPDEFS=Xmh
16 16
17LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 17LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
18DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \ 18DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
19 ${LIBXPM} ${LIBXEXT} ${LIBX11} 19 ${LIBXPM} ${LIBXEXT} ${LIBX11}
20 20
21.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults 21.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 22.PATH: ${X11SRCDIR.${PROG}}/man
22 23
23CWARNFLAGS.clang+= -Wno-format 24CWARNFLAGS.clang+= -Wno-format
24 25
25.include <bsd.x11.mk> 26.include <bsd.x11.mk>
26.include <bsd.prog.mk> 27.include <bsd.prog.mk>
cvs diff -r1.4 -r1.5 src/external/mit/xorg/bin/xmodmap/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xmodmap/Makefile 2014/03/17 10:11:27 1.4
+++ src/external/mit/xorg/bin/xmodmap/Makefile 2015/07/19 23:15:06 1.5
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1# $NetBSD: Makefile,v 1.4 2014/03/17 10:11:27 mrg Exp $ 1# $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xmodmap 5PROG= xmodmap
6SRCS= xmodmap.c pf.c handle.c exec.c 6SRCS= xmodmap.c pf.c handle.c exec.c
7 7
8CPPFLAGS+= -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H 8CPPFLAGS+= -DHAVE_ASPRINTF -DHAVE_STRNCASECMP
9 9
10LDADD+= -lX11 10LDADD+= -lX11
11DPADD+= ${LIBX11} 11DPADD+= ${LIBX11}
12 12
13.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man 13.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
14 14
15COPTS.handle.c+=-Wno-error # uses XKeycodeToKeysym 15COPTS.handle.c+=-Wno-error # uses XKeycodeToKeysym
16COPTS.exec.c+= -Wno-error # uses XKeycodeToKeysym 16COPTS.exec.c+= -Wno-error # uses XKeycodeToKeysym
17 17
 18.include "../../xorg-pkg-ver.mk"
 19
18.include <bsd.x11.mk> 20.include <bsd.x11.mk>
19.include <bsd.prog.mk> 21.include <bsd.prog.mk>
cvs diff -r1.4 -r1.5 src/external/mit/xorg/bin/xvinfo/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xvinfo/Makefile 2014/07/12 20:31:04 1.4
+++ src/external/mit/xorg/bin/xvinfo/Makefile 2015/07/19 23:15:06 1.5
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.4 2014/07/12 20:31:04 nakayama Exp $ 1# $NetBSD: Makefile,v 1.5 2015/07/19 23:15:06 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xvinfo 5PROG= xvinfo
6 6
7LDADD+= -lXv -lXext -lX11 7LDADD+= -lXv -lXext -lX11
8DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11} 8DPADD+= ${LIBXV} ${LIBXEXT} ${LIBX11}
9 9
10CPPFLAGS+= -DPACKAGE_STRING="\"xvinfo 1.1.2\"" 
11 
12.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man 10.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
13 11
14CWARNFLAGS.clang+= -Wno-dangling-else 12CWARNFLAGS.clang+= -Wno-dangling-else
15 13
 14.include "../../xorg-pkg-ver.mk"
 15
16.include <bsd.x11.mk> 16.include <bsd.x11.mk>
17.include <bsd.prog.mk> 17.include <bsd.prog.mk>