[src/trunk]: src/external/mit/xorg use xorg-pkg-ver.mk for silicon-motion.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1c6951ec94ad
branches:  trunk
changeset: 339397:1c6951ec94ad
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 20 02:07:36 2015 +0000

description:
use xorg-pkg-ver.mk for silicon-motion.

diffstat:

 external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile |   7 ++++-
 external/mit/xorg/xorg-pkg-ver.mk                                  |  12 +++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r a1ad5e2903d8 -r 1c6951ec94ad external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Mon Jul 20 01:17:46 2015 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-siliconmotion/Makefile        Mon Jul 20 02:07:36 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/06/03 09:12:28 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2015/07/20 02:07:36 mrg Exp $
 
 DRIVER=                xf86-video-siliconmotion
 DRIVER_NAME=   siliconmotion_drv
@@ -10,6 +10,9 @@
 SRCS+=         smi501_crtc.c smi501_output.c
 MAN=           siliconmotion.4
 
-CPPFLAGS+=     -I${X11SRCDIR.${DRIVER}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+=     -DHAVE_XAA_H -DHAVE_XMODES -DHAVE_XEXTPROTO_71
 
 .include "../Makefile.xf86-driver"
+
+XORG_PKG_VER_PROG=     ${DRIVER}
+.include "../../../xorg-pkg-ver.mk"
diff -r a1ad5e2903d8 -r 1c6951ec94ad external/mit/xorg/xorg-pkg-ver.mk
--- a/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 01:17:46 2015 +0000
+++ b/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 02:07:36 2015 +0000
@@ -1,16 +1,18 @@
-#      $NetBSD: xorg-pkg-ver.mk,v 1.1 2015/07/19 19:49:17 mrg Exp $
+#      $NetBSD: xorg-pkg-ver.mk,v 1.2 2015/07/20 02:07:36 mrg Exp $
 
 # when including this make sure PROG is set so that $X11SRCDIR.$PROG
-# is a valid setting.
+# is a valid setting.  set XORG_PKG_VER_PROG if PROG is wrong.
 
-.if exists(${X11SRCDIR.${PROG}}/configure)
+XORG_PKG_VER_PROG?=    ${PROG}
+
+.if exists(${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure)
 XORG_PKG_PACKAGE_VERSION!= \
        awk -F= '/^PACKAGE_VERSION=/ {                          \
             match($$2, "([0-9]+\\.)+[0-9]+");                  \
             version = substr($$2, RSTART, RLENGTH);            \
             print version;                                     \
             exit 0;                                            \
-       }' ${X11SRCDIR.${PROG}}/configure
+       }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 .if !empty(XORG_PKG_PACKAGE_VERSION)
 CPPFLAGS+=     -DPACKAGE_VERSION=\"${XORG_PKG_PACKAGE_VERSION:Q}\"
 .endif
@@ -21,7 +23,7 @@
             string = substr($$2, RSTART, RLENGTH);             \
             print string;                                      \
             exit 0;                                            \
-       }' ${X11SRCDIR.${PROG}}/configure
+       }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
 .if !empty(XORG_PKG_PACKAGE_STRING)
 CPPFLAGS+=     -DPACKAGE_STRING=\"${XORG_PKG_PACKAGE_STRING:Q}\"
 .endif