Module Name: src
Committed By: maya
Date: Wed Jul 4 12:25:49 UTC 2018
Modified Files:
src/external/mit/xorg/bin/fc-cache: Makefile
src/external/mit/xorg/bin/fc-cat: Makefile
src/external/mit/xorg/bin/fc-list: Makefile
src/external/mit/xorg/bin/fc-match: Makefile
src/external/mit/xorg/bin/fc-pattern: Makefile
src/external/mit/xorg/bin/fc-query: Makefile
src/external/mit/xorg/bin/fc-scan: Makefile
src/external/mit/xorg/bin/fc-validate: Makefile
Log Message:
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)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fc-cache/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-cat/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-list/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fc-match/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-pattern/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/fc-query/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/bin/fc-scan/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/bin/fc-validate/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/fc-cache/Makefile
diff -u src/external/mit/xorg/bin/fc-cache/Makefile:1.3 src/external/mit/xorg/bin/fc-cache/Makefile:1.4
--- src/external/mit/xorg/bin/fc-cache/Makefile:1.3 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-cache/Makefile Wed Jul 4 12:25:48 2018
@@ -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 @@ PROG= fc-cache
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}
Index: src/external/mit/xorg/bin/fc-cat/Makefile
diff -u src/external/mit/xorg/bin/fc-cat/Makefile:1.2 src/external/mit/xorg/bin/fc-cat/Makefile:1.3
--- src/external/mit/xorg/bin/fc-cat/Makefile:1.2 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-cat/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
Index: src/external/mit/xorg/bin/fc-list/Makefile
diff -u src/external/mit/xorg/bin/fc-list/Makefile:1.2 src/external/mit/xorg/bin/fc-list/Makefile:1.3
--- src/external/mit/xorg/bin/fc-list/Makefile:1.2 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-list/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
Index: src/external/mit/xorg/bin/fc-match/Makefile
diff -u src/external/mit/xorg/bin/fc-match/Makefile:1.3 src/external/mit/xorg/bin/fc-match/Makefile:1.4
--- src/external/mit/xorg/bin/fc-match/Makefile:1.3 Fri Jan 3 20:18:45 2014
+++ src/external/mit/xorg/bin/fc-match/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
Index: src/external/mit/xorg/bin/fc-pattern/Makefile
diff -u src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 src/external/mit/xorg/bin/fc-pattern/Makefile:1.3
--- src/external/mit/xorg/bin/fc-pattern/Makefile:1.2 Sun Apr 17 02:16:26 2016
+++ src/external/mit/xorg/bin/fc-pattern/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
Index: src/external/mit/xorg/bin/fc-query/Makefile
diff -u src/external/mit/xorg/bin/fc-query/Makefile:1.3 src/external/mit/xorg/bin/fc-query/Makefile:1.4
--- src/external/mit/xorg/bin/fc-query/Makefile:1.3 Sun Apr 17 02:16:26 2016
+++ src/external/mit/xorg/bin/fc-query/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
Index: src/external/mit/xorg/bin/fc-scan/Makefile
diff -u src/external/mit/xorg/bin/fc-scan/Makefile:1.2 src/external/mit/xorg/bin/fc-scan/Makefile:1.3
--- src/external/mit/xorg/bin/fc-scan/Makefile:1.2 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-scan/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
Index: src/external/mit/xorg/bin/fc-validate/Makefile
diff -u src/external/mit/xorg/bin/fc-validate/Makefile:1.1 src/external/mit/xorg/bin/fc-validate/Makefile:1.2
--- src/external/mit/xorg/bin/fc-validate/Makefile:1.1 Mon Jun 3 20:23:39 2013
+++ src/external/mit/xorg/bin/fc-validate/Makefile Wed Jul 4 12:25:49 2018
@@ -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}
