[src/trunk]: src/external/mit/xorg add PACKAGE_NAME support to xorg-pkg-ver.mk.

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/external/mit/xorg add PACKAGE_NAME support to xorg-pkg-ver.mk.
From: mrg <mrg%NetBSD.org@localhost>
Date: Tue, 31 Jul 2018 19:30:27 +0000
details:   https://anonhg.NetBSD.org/src/rev/5365e2288490
branches:  trunk
changeset: 339412:5365e2288490
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Jul 20 23:50:22 2015 +0000

description:
add PACKAGE_NAME support to xorg-pkg-ver.mk.
switch to using xorg-pkg-ver.mk.

diffstat:

 external/mit/xorg/bin/appres/Makefile            |   6 +++---
 external/mit/xorg/bin/bdftopcf/Makefile          |   6 +++---
 external/mit/xorg/bin/iceauth/Makefile           |   6 +++---
 external/mit/xorg/bin/mkfontscale/Makefile       |   5 +++--
 external/mit/xorg/bin/xkbcomp/Makefile           |   7 +++++--
 external/mit/xorg/bin/xkbutils/Makefile.xkbutils |   7 +++++--
 external/mit/xorg/bin/xmag/Makefile              |   6 ++++--
 external/mit/xorg/bin/xman/Makefile              |   3 +--
 external/mit/xorg/xorg-pkg-ver.mk                |  13 ++++++++++++-
 9 files changed, 39 insertions(+), 20 deletions(-)

diffs (211 lines):

diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/appres/Makefile
--- a/external/mit/xorg/bin/appres/Makefile     Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/appres/Makefile     Mon Jul 20 23:50:22 2015 +0000
@@ -1,16 +1,16 @@
-#      $NetBSD: Makefile,v 1.4 2014/01/22 15:23:06 christos Exp $
+#      $NetBSD: Makefile,v 1.5 2015/07/20 23:50:22 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  appres
 
-CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-
 LDADD+=        -lXt -lSM -lICE -lXext -lX11 -lxcb -lXdmcp -lXau
 DPADD+=        ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBXCB} ${LIBXDMCP} ${LIBXAU}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/bdftopcf/Makefile
--- a/external/mit/xorg/bin/bdftopcf/Makefile   Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/bdftopcf/Makefile   Mon Jul 20 23:50:22 2015 +0000
@@ -1,16 +1,16 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 05:24:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2015/07/20 23:50:22 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  bdftopcf
 
-CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-
 LDADD+=        -lXfont -lfontenc -lfreetype -lm -lz -lbz2
 DPADD+=        ${LIBXFONT} ${LIBFONTENC} ${LIBFREETYPE} ${LIBM} ${LIBZ} ${LIBBZ2}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/iceauth/Makefile
--- a/external/mit/xorg/bin/iceauth/Makefile    Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/iceauth/Makefile    Mon Jul 20 23:50:22 2015 +0000
@@ -1,16 +1,16 @@
-#      $NetBSD: Makefile,v 1.3 2015/07/17 08:29:31 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2015/07/20 23:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=  iceauth
 SRCS=  iceauth.c process.c
 
-CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
-
 LDADD+=        -lICE
 DPADD+=        ${LIBICE}
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/mkfontscale/Makefile
--- a/external/mit/xorg/bin/mkfontscale/Makefile        Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/mkfontscale/Makefile        Mon Jul 20 23:50:22 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2014/03/17 09:02:16 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2015/07/20 23:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,12 +6,13 @@
 SRCS=  mkfontscale.c list.c hash.c ident.c
 
 CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/freetype2
-CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
 
 LDADD+=        -lfontenc -lfreetype -lz -lbz2
 DPADD+=        ${LIBFONTENC} ${LIBFREETYPE} ${LIBZ} ${LIBBZ2}
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/xkbcomp/Makefile
--- a/external/mit/xorg/bin/xkbcomp/Makefile    Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/xkbcomp/Makefile    Mon Jul 20 23:50:22 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2011/08/11 23:15:35 joerg Exp $
+#      $NetBSD: Makefile,v 1.10 2015/07/20 23:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 .include "Makefile.common"
@@ -11,7 +11,8 @@
 
 CPPFLAGS.xkbpath.c=    -DDFLT_XKB_CONFIG_ROOT=\"${XKBROOTDIR}\"
 
-CPPFLAGS+=             -I${X11SRCDIR.${PROG}} -I${X11SRCDIR.${PROG}}/../include -DHAVE_CONFIG_H
+CPPFLAGS+=             -I${X11SRCDIR.${PROG}}
+CPPFLAGS+=             -DHAVE_STRDUP -DHAVE_STRCASECMP
 CPPFLAGS.geometry.c=   -Wno-error      # XXX
 COPTS.xkbscan.c+=      -Wno-stack-protector
 
@@ -29,5 +30,7 @@
 
 CWARNFLAGS.clang+=     -Wno-parentheses
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/xkbutils/Makefile.xkbutils
--- a/external/mit/xorg/bin/xkbutils/Makefile.xkbutils  Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/xkbutils/Makefile.xkbutils  Mon Jul 20 23:50:22 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.xkbutils,v 1.4 2014/03/20 06:18:20 mrg Exp $
+#      $NetBSD: Makefile.xkbutils,v 1.5 2015/07/20 23:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -8,9 +8,12 @@
 DPADD+=        ${LIBXKBFILE} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
        ${LIBXPM} ${LIBXEXT} ${LIBX11}
 
-CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.xkbutils}/../include
+CPPFLAGS+=     -DHAVE_STRCASECMP
 
 .PATH: ${X11SRCDIR.xkbutils} ${X11SRCDIR.xkbutils}/man
 
+XORG_PKG_VER_PROG=xkbutils
+.include "../../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/xmag/Makefile
--- a/external/mit/xorg/bin/xmag/Makefile       Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/xmag/Makefile       Mon Jul 20 23:50:22 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 08:01:59 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2015/07/20 23:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@
 
 APPDEFS=Xmag
 
-CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include
+CPPFLAGS+=     -DHAVE_LRINT -DHAVE_NANOSLEEP
 
 LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
 DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
@@ -16,5 +16,7 @@
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 .PATH: ${X11SRCDIR.${PROG}}/man
 
+.include "../../xorg-pkg-ver.mk"
+
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/bin/xman/Makefile
--- a/external/mit/xorg/bin/xman/Makefile       Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/bin/xman/Makefile       Mon Jul 20 23:50:22 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2015/07/19 23:15:06 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2015/07/20 23:50:23 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -9,7 +9,6 @@
 CPPFLAGS+=${X11FLAGS.VERSION}
 CPPFLAGS+=-DHELPFILE=\"${X11LIBDIR}/xman.help\"
 CPPFLAGS+=-DMANCONFIGSTYLE_OpenBSD -DMANCONF=\"/etc/man.conf\"
-#CPPFLAGS+=-DHAVE_CONFIG_H -I${X11SRCDIR.${PROG}}/../include
 
 APPDEFS=Xman
 
diff -r 3bbfe691bd6f -r 5365e2288490 external/mit/xorg/xorg-pkg-ver.mk
--- a/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 22:45:10 2015 +0000
+++ b/external/mit/xorg/xorg-pkg-ver.mk Mon Jul 20 23:50:22 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: xorg-pkg-ver.mk,v 1.3 2015/07/20 04:10:40 mrg Exp $
+#      $NetBSD: xorg-pkg-ver.mk,v 1.4 2015/07/20 23:50:22 mrg Exp $
 
 # when including this make sure PROG is set so that $X11SRCDIR.$PROG
 # is a valid setting.  set XORG_PKG_VER_PROG if PROG is wrong.
@@ -32,4 +32,15 @@
 CPPFLAGS+=     -DPACKAGE_STRING=\"${XORG_PKG_PACKAGE_STRING:Q}\"
 .endif
 
+XORG_PKG_PACKAGE_NAME!= \
+       awk -F= '/^PACKAGE_NAME=/ {                             \
+            match($$2, "'"'"'[a-zA-Z-_0-9]+'"'"'");            \
+            name = substr($$2, RSTART, RLENGTH);               \
+            print name;                                        \
+            exit 0;                                            \
+       }' ${X11SRCDIR.${XORG_PKG_VER_PROG}}/configure
+.if !empty(XORG_PKG_PACKAGE_NAME)
+CPPFLAGS+=     -DPACKAGE_NAME=\"${XORG_PKG_PACKAGE_NAME:Q}\"
 .endif
+
+.endif
Prev by Date: [src/trunk]: src/distrib/zaurus/ramdisk Adding -DNDEBUG saves about 5KB of te...
Next by Date: [src/trunk]: src/sys/dev/mii Fix typos reported by yuo@.
Previous by Thread: [src/trunk]: src/distrib/zaurus/ramdisk Adding -DNDEBUG saves about 5KB of te...
Next by Thread: [src/trunk]: src/sys/dev/mii Fix typos reported by yuo@.
Indexes:
Home | Main Index | Thread Index | Old Index