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 <bsd.own.mk>
@@ -11,5 +11,7 @@ DPADD+= ${LIBXXF86VM} ${LIBXAW} ${LIBXMU
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
+.include "../../xorg-pkg-ver.mk"
+
.include <bsd.x11.mk>
.include <bsd.prog.mk>
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 <bsd.own.mk>
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 <bsd.x11.mk>
.include <bsd.prog.mk>
