[src/trunk]: src/external/mit/xorg add some missing @foo@ cases for libepoxy, ...

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

details:   https://anonhg.NetBSD.org/src/rev/0be05702d12a
branches:  trunk
changeset: 822155:0be05702d12a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun Mar 05 11:52:38 2017 +0000

description:
add some missing @foo@ cases for libepoxy, libxshmfence and xorg-server.

diffstat:

 external/mit/xorg/lib/libepoxy/Makefile       |  4 +++-
 external/mit/xorg/lib/libxshmfence/Makefile   |  7 ++++++-
 external/mit/xorg/server/xorg-server/Makefile |  3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diffs (56 lines):

diff -r 026c8547a6ed -r 0be05702d12a external/mit/xorg/lib/libepoxy/Makefile
--- a/external/mit/xorg/lib/libepoxy/Makefile   Sun Mar 05 11:07:46 2017 +0000
+++ b/external/mit/xorg/lib/libepoxy/Makefile   Sun Mar 05 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2016/08/18 07:44:32 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2017/03/05 11:52:38 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -26,6 +26,8 @@
 CPPFLAGS+=     ${X11FLAGS.CONNECTION}
 
 PKGCONFIG=     epoxy
+PKGCONFIG_SED_FLAGS= \
+        -e "s,@DLOPEN_LIBS@,,"
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
diff -r 026c8547a6ed -r 0be05702d12a external/mit/xorg/lib/libxshmfence/Makefile
--- a/external/mit/xorg/lib/libxshmfence/Makefile       Sun Mar 05 11:07:46 2017 +0000
+++ b/external/mit/xorg/lib/libxshmfence/Makefile       Sun Mar 05 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2016/09/27 19:18:42 joerg Exp $
+#      $NetBSD: Makefile,v 1.6 2017/03/05 11:52:39 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -22,6 +22,11 @@
 NOMAN= # defined
 
 PKGDIST=       ${LIB}
+# XXX PTHREAD_LIBS really should be -pthread for more general
+# XXX but the package doesn't really do this.
+PKGCONFIG_SED_FLAGS= \
+        -e "s,@XPROTO_CFLAGS@,-I${X11INCDIR},; \
+           s,@PTHREAD_LIBS@,-lpthread,"
 
 COPTS.xshmfence_semaphore.c += -Wno-stack-protector
 
diff -r 026c8547a6ed -r 0be05702d12a external/mit/xorg/server/xorg-server/Makefile
--- a/external/mit/xorg/server/xorg-server/Makefile     Sun Mar 05 11:07:46 2017 +0000
+++ b/external/mit/xorg/server/xorg-server/Makefile     Sun Mar 05 11:52:38 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.27 2016/08/21 20:51:04 mrg Exp $
+#      $NetBSD: Makefile,v 1.28 2017/03/05 11:52:39 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -29,6 +29,7 @@
 # Use -fvisibility=hidden for symbol_visibility?
 PKGCONFIG_SED_FLAGS= \
        -e "s,@sysconfigdir@,${X11ETCDIR},; \
+           s,@XORG_DRIVER_LIBS@,,; \
            s,@SDK_REQUIRED_MODULES@,xproto >= 7.0.28 randrproto >= 1.5.0 renderproto >= 0.11 xextproto >= 7.2.99.901 inputproto >= 2.3 kbproto >= 1.0.3 fontsproto >= 2.1.3 fixesproto >= 5.0 
damageproto >= 1.1 xcmiscproto >= 1.2.0 bigreqsproto >= 1.1.0 xtrans >= 1.3.5 presentproto >= 1.0,; \
            s,@symbol_visibility@,,"