Sun Mar 5 11:52:39 2017 UTC ()
add some missing @foo@ cases for libepoxy, libxshmfence and xorg-server.
(mrg)
diff -r1.1 -r1.2 src/external/mit/xorg/lib/libepoxy/Makefile
diff -r1.5 -r1.6 src/external/mit/xorg/lib/libxshmfence/Makefile
diff -r1.27 -r1.28 src/external/mit/xorg/server/xorg-server/Makefile
--- src/external/mit/xorg/lib/libepoxy/Makefile 2016/08/18 07:44:32 1.1
+++ src/external/mit/xorg/lib/libepoxy/Makefile 2017/03/05 11:52:38 1.2
@@ -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>
--- src/external/mit/xorg/lib/libxshmfence/Makefile 2016/09/27 19:18:42 1.5
+++ src/external/mit/xorg/lib/libxshmfence/Makefile 2017/03/05 11:52:39 1.6
@@ -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
--- src/external/mit/xorg/server/xorg-server/Makefile 2016/08/21 20:51:04 1.27
+++ src/external/mit/xorg/server/xorg-server/Makefile 2017/03/05 11:52:39 1.28
@@ -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@,,"