Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/mit/xorg/bin Claim to have getopt_long.



details:   https://anonhg.NetBSD.org/src/rev/98b5a4f2ec61
branches:  trunk
changeset: 320397:98b5a4f2ec61
user:      maya <maya%NetBSD.org@localhost>
date:      Wed Jul 04 12:25:48 2018 +0000

description:
Claim to have getopt_long.

We do, and packages occasionally expect the long options to exist.
Pointed out while investigating
PR pkg/53425: graphics/py-matplotlib 2.2.2 import fails
(which is not fixed by this commit)

diffstat:

 external/mit/xorg/bin/fc-cache/Makefile    |  3 ++-
 external/mit/xorg/bin/fc-cat/Makefile      |  3 ++-
 external/mit/xorg/bin/fc-list/Makefile     |  3 ++-
 external/mit/xorg/bin/fc-match/Makefile    |  3 ++-
 external/mit/xorg/bin/fc-pattern/Makefile  |  3 ++-
 external/mit/xorg/bin/fc-query/Makefile    |  3 ++-
 external/mit/xorg/bin/fc-scan/Makefile     |  3 ++-
 external/mit/xorg/bin/fc-validate/Makefile |  3 ++-
 8 files changed, 16 insertions(+), 8 deletions(-)

diffs (129 lines):

diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-cache/Makefile
--- a/external/mit/xorg/bin/fc-cache/Makefile   Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-cache/Makefile   Wed Jul 04 12:25:48 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2018/07/04 12:25:48 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,7 @@
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
 CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.fontconfig}/../include
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-cat/Makefile
--- a/external/mit/xorg/bin/fc-cat/Makefile     Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-cat/Makefile     Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-cat
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-list/Makefile
--- a/external/mit/xorg/bin/fc-list/Makefile    Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-list/Makefile    Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-list
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-match/Makefile
--- a/external/mit/xorg/bin/fc-match/Makefile   Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-match/Makefile   Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2014/01/03 20:18:45 christos Exp $
+#      $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-match
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat -lbz2 -lz
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBBZ2} ${LIBZ}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-pattern/Makefile
--- a/external/mit/xorg/bin/fc-pattern/Makefile Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-pattern/Makefile Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2016/04/17 02:16:26 nakayama Exp $
+#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-pattern
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-query/Makefile
--- a/external/mit/xorg/bin/fc-query/Makefile   Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-query/Makefile   Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.3 2016/04/17 02:16:26 nakayama Exp $
+#      $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-query
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-scan/Makefile
--- a/external/mit/xorg/bin/fc-scan/Makefile    Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-scan/Makefile    Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2013/06/03 20:23:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-scan
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
diff -r 9cbfe0d97034 -r 98b5a4f2ec61 external/mit/xorg/bin/fc-validate/Makefile
--- a/external/mit/xorg/bin/fc-validate/Makefile        Wed Jul 04 07:55:57 2018 +0000
+++ b/external/mit/xorg/bin/fc-validate/Makefile        Wed Jul 04 12:25:48 2018 +0000
@@ -1,10 +1,11 @@
-#      $NetBSD: Makefile,v 1.1 2013/06/03 20:23:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.2 2018/07/04 12:25:49 maya Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fc-validate
 
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
+CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
 LDADD+=        -lfontconfig -lfreetype -lexpat
 DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}



Home | Main Index | Thread Index | Old Index