CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: martin
Date: Thu Jan 19 17:07:38 UTC 2023
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Pass -DALIGNOF_VOID_P with proper size to fix the tools build
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.20 src/external/mit/xorg/tools/fc-cache/Makefile:1.21
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.20 Thu Jan 19 06:29:10 2023
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Jan 19 17:07:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2023/01/19 06:29:10 mrg Exp $
+# $NetBSD: Makefile,v 1.21 2023/01/19 17:07:38 martin Exp $
.include
@@ -89,7 +89,6 @@ SRCS.expat= xmlparse.c xmltok.c xmlrole.
SRCS= ${SRCS.fc-cache} ${SRCS.fontconfig} ${SRCS.freetype} ${SRCS.expat}
# XXX FONTCONFIG_PATH was arbitrarily chosen
-# XXX ALIGNOF_VOID_P=8 not valid for 32 bit, but probably ok?
HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DESTDIR}/etc/X11/fonts"' \
-DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' \
-DFC_TEMPLATEDIR='"${DESTDIR}${X11FONTDIR}"' \
@@ -97,7 +96,8 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
-DCONFIGDIR='"${DESTDIR}/etc/fonts/conf.d"' \
-DFC_GPERF_SIZE_T=unsigned \
-DFC_NO_MT=1 \
- -DALIGNOF_VOID_P=8 \
+ -DALIGNOF_VOID_P=${PTRSIZE} \
+ -DSIZEOF_VOID_P=${PTRSIZE} \
-DHAVE_FT_BITMAP_SIZE_Y_PPEM \
-DHAVE_FT_GET_BDF_PROPERTY \
-DHAVE_FT_GET_NEXT_CHAR \
@@ -131,4 +131,11 @@ LDADD= -lz
.include "../../lib/fontconfig/src/Makefile.fcarch"
.include
+
+.if empty(X11FLAGS.SERVER:M-D_XSERVER64)
+PTRSIZE= 4
+.else
+PTRSIZE= 8
+.endif
+
.include
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: martin Date: Thu Jan 19 17:07:38 UTC 2023 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Pass -DALIGNOF_VOID_P with proper size to fix the tools build To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: mrg
Date: Fri Sep 9 19:15:20 UTC 2022
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
add missing reallocarray.c.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/tools/mkfontscale/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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.15 src/external/mit/xorg/tools/mkfontscale/Makefile:1.16
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.15 Sat Jul 20 03:54:50 2019
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Sep 9 19:15:20 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/07/20 03:54:50 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2022/09/09 19:15:20 mrg Exp $
.include
@@ -12,7 +12,8 @@ SRCS.mkfontscale= mkfontscale.c hash.c i
.PATH: ${FREETYPE}/src/base
SRCS.freetype+= ftbase.c ftbbox.c ftbdf.c ftdebug.c \
ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
- ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
+ ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c \
+ reallocarray.c
.PATH: ${FREETYPE}/src/autofit
SRCS.freetype+= autofit.c
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src Committed By: mrg Date: Fri Sep 9 19:15:20 UTC 2022 Modified Files: src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: add missing reallocarray.c. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: martin
Date: Thu Feb 24 06:34:32 UTC 2022
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Add more -I to find expat_config.h
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.18 src/external/mit/xorg/tools/fc-cache/Makefile:1.19
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.18 Mon Sep 16 06:16:42 2019
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Feb 24 06:34:32 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/09/16 06:16:42 maya Exp $
+# $NetBSD: Makefile,v 1.19 2022/02/24 06:34:32 martin Exp $
.include
@@ -114,7 +114,7 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='"${DES
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
-I${FREETYPE}/include -I${FREETYPE}/include/freetype \
- -I${EXPAT}/lib \
+ -I${EXPAT}/lib -I${EXPAT}/../lib/libexpat \
-I${FONTCONFIG}/../include \
-I${DESTDIR}${X11INCDIR} -I. \
-I${FONTCONFIG}/../include
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: martin Date: Thu Feb 24 06:34:32 UTC 2022 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Add more -I to find expat_config.h To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: maya
Date: Mon Sep 16 06:16:42 UTC 2019
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
Define XML_POOR_ENTROPY in preparation of importing a new expat.
This is the tool fc-cache built as a native binary on the host
during the build.
The host might be non-netbsd, and we don't run configure, so we can't
know what kind of random functions it supports.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.17 src/external/mit/xorg/tools/fc-cache/Makefile:1.18
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.17 Sat Jul 20 03:54:50 2019
+++ src/external/mit/xorg/tools/fc-cache/Makefile Mon Sep 16 06:16:42 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/07/20 03:54:50 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2019/09/16 06:16:42 maya Exp $
.include
@@ -119,6 +119,8 @@ HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREE
-I${DESTDIR}${X11INCDIR} -I. \
-I${FONTCONFIG}/../include
+HOST_CPPFLAGS+= -DXML_POOR_ENTROPY
+
HOST_CPPFLAGS+= -DTOOL_FCCACHE
LDADD= -lz
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: maya Date: Mon Sep 16 06:16:42 UTC 2019 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: Define XML_POOR_ENTROPY in preparation of importing a new expat. This is the tool fc-cache built as a native binary on the host during the build. The host might be non-netbsd, and we don't run configure, so we can't know what kind of random functions it supports. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src
Committed By: mrg
Date: Sat Jul 20 03:54:50 UTC 2019
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
update for freetype 2.10.0
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/tools/mkfontscale/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.16 src/external/mit/xorg/tools/fc-cache/Makefile:1.17
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.16 Fri Mar 8 09:58:24 2019
+++ src/external/mit/xorg/tools/fc-cache/Makefile Sat Jul 20 03:54:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2019/03/08 09:58:24 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2019/07/20 03:54:50 mrg Exp $
.include
@@ -22,7 +22,7 @@ SRCS.fontconfig= fcatomic.c fccache.c fc
ftglue.c
.PATH: ${FREETYPE}/src/base
-SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
+SRCS.freetype= ftbase.c ftbbox.c ftbdf.c ftdebug.c \
ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.14 src/external/mit/xorg/tools/mkfontscale/Makefile:1.15
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.14 Sun Mar 3 09:26:04 2019
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sat Jul 20 03:54:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2019/03/03 09:26:04 mrg Exp $
+# $NetBSD: Makefile,v 1.15 2019/07/20 03:54:50 mrg Exp $
.include
@@ -10,7 +10,7 @@ FREETYPE= ${X11SRCDIR.freetype}
SRCS.mkfontscale= mkfontscale.c hash.c ident.c list.c constlist.c
.PATH: ${FREETYPE}/src/base
-SRCS.freetype+= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \
+SRCS.freetype+= ftbase.c ftbbox.c ftbdf.c ftdebug.c \
ftglyph.c ftinit.c ftmm.c ftpfr.c ftstroke.c ftsynth.c \
ftsystem.c fttype1.c ftwinfnt.c ftbitmap.c
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: mrg Date: Sat Jul 20 03:54:50 UTC 2019 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: update for freetype 2.10.0 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.14 -r1.15 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: christos
Date: Tue Jul 3 21:12:10 UTC 2018
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Use the fonts from our installed directory not the system when we are a tool!
Martin found it.
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/tools/mkfontscale/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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.12 src/external/mit/xorg/tools/mkfontscale/Makefile:1.13
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.12 Wed May 9 04:13:23 2018
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Tue Jul 3 17:12:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/05/09 08:13:23 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/07/03 21:12:10 christos Exp $
.include
@@ -81,7 +81,7 @@ LDADD= -lz
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
- -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
+ -DFONT_ENCODINGS_DIRECTORY=\"${DESTDIR}${X11FONTDIR}/encodings/encodings.dir\" \
-DPACKAGE_STRING=\"NetBSD\ tools\ version\"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src Committed By: christos Date: Tue Jul 3 21:12:10 UTC 2018 Modified Files: src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: Use the fonts from our installed directory not the system when we are a tool! Martin found it. XXX pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src
Committed By: christos
Date: Tue May 1 17:42:01 UTC 2018
Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/makekeys: Makefile
src/external/mit/xorg/tools/makestrs: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
src/external/mit/xorg/tools/ucs2any: Makefile
Added Files:
src/external/mit/xorg/tools: Makefile.inc
Log Message:
Apply the same fixes from the regular tools dir:
PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might
not support the necessary options. This is done thusly:
1. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that
include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc
first. This will also allow us to control other tools options from a
single location if we need to.
2. Centralize NOMAN handling.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/tools/Makefile.inc
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/bdftopcf/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/makekeys/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/makestrs/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/mkfontscale/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/ucs2any/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.7 src/external/mit/xorg/tools/bdftopcf/Makefile:1.8
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.7 Sun Mar 11 07:01:07 2018
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Tue May 1 13:42:00 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2018/03/11 11:01:07 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/05/01 17:42:00 christos Exp $
-NOMAN= 1
-
-.include
+.include
HOSTPROG= bdftopcf
.PATH: ${X11SRCDIR.bdftopcf}
Index: src/external/mit/xorg/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.11 src/external/mit/xorg/tools/fc-cache/Makefile:1.12
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.11 Tue Aug 29 05:02:10 2017
+++ src/external/mit/xorg/tools/fc-cache/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2017/08/29 09:02:10 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include
+.include
HOSTPROG= fc-cache
Index: src/external/mit/xorg/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.5 src/external/mit/xorg/tools/makekeys/Makefile:1.6
--- src/external/mit/xorg/tools/makekeys/Makefile:1.5 Wed Mar 14 19:41:05 2018
+++ src/external/mit/xorg/tools/makekeys/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2018/03/14 23:41:05 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include
+.include
.PATH: ${X11SRCDIR.X11}/src/util
Index: src/external/mit/xorg/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.4 src/external/mit/xorg/tools/makestrs/Makefile:1.5
--- src/external/mit/xorg/tools/makestrs/Makefile:1.4 Wed Jun 24 18:20:26 2015
+++ src/external/mit/xorg/tools/makestrs/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/06/24 22:20:26 matt Exp $
+# $NetBSD: Makefile,v 1.5 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include
+.include
.PATH: ${X11SRCDIR.Xt}/util
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.8 src/external/mit/xorg/tools/mkfontscale/Makefile:1.9
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.8 Sun Feb 28 17:12:26 2016
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.9 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include
+.include
HOSTPROG= mkfontscale
Index: src/external/mit/xorg/tools/ucs2any/Makefile
diff -u src/external/mit/xorg/tools/ucs2any/Makefile:1.2 src/external/mit/xorg/tools/ucs2any/Makefile:1.3
--- src/external/mit/xorg/tools/ucs2any/Makefile:1.2 Sat Sep 13 17:37:07 2008
+++ src/external/mit/xorg/tools/ucs2any/Makefile Tue May 1 13:42:01 2018
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/09/13 21:37:07 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2018/05/01 17:42:01 christos Exp $
-NOMAN= 1
-
-.include
+.include
HOSTPROG= ucs2any
.PATH: ${X11SRCDIR.font-util}
Added files:
Index: src/external/mit/xorg/tools/Makefile.inc
diff -u /dev/null src/external/mit/xorg/tools/Makefile.inc:1.1
--- /dev/null Tue May 1 13:42:01
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: christos Date: Tue May 1 17:42:01 UTC 2018 Modified Files: src/external/mit/xorg/tools/bdftopcf: Makefile src/external/mit/xorg/tools/fc-cache: Makefile src/external/mit/xorg/tools/makekeys: Makefile src/external/mit/xorg/tools/makestrs: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile src/external/mit/xorg/tools/ucs2any: Makefile Added Files: src/external/mit/xorg/tools: Makefile.inc Log Message: Apply the same fixes from the regular tools dir: PR/53238: Robert Elz: Disable MKREPRO in tools; the host compiler might not support the necessary options. This is done thusly: 1. Create Makefile.inc and set MKREPRO=no in it. Change the Makefiles that include bsd.own.mk, to include bsd.init.mk which includes Makefile.inc first. This will also allow us to control other tools options from a single location if we need to. 2. Centralize NOMAN handling. XXX: pullup-8 To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/tools/Makefile.inc cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/bdftopcf/Makefile cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/tools/makekeys/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/makestrs/Makefile cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/mkfontscale/Makefile cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/ucs2any/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/bdftopcf
Module Name:src
Committed By: mrg
Date: Sun Mar 11 11:01:08 UTC 2018
Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile
Log Message:
move the src list from libXfont stuff to local stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/bdftopcf/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.6 src/external/mit/xorg/tools/bdftopcf/Makefile:1.7
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.6 Fri May 31 05:24:50 2013
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Sun Mar 11 11:01:07 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/05/31 05:24:50 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2018/03/11 11:01:07 mrg Exp $
NOMAN= 1
@@ -9,26 +9,28 @@ HOSTPROG= bdftopcf
FREETYPE= ${X11SRCDIR.freetype}
-SRCS= bdftopcf.c
+SRCS= atom.c \
+ bdfread.c \
+ bdfutils.c \
+ bitmap.c \
+ bitmaputil.c \
+ bufio.c \
+ defaults.c \
+ fileio.c \
+ filewr.c \
+ fontaccel.c \
+ fontink.c \
+ pcfwrite.c \
+ private.c \
+ utilbitmap.c \
+ bdftopcf.c
HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR} \
- -I${DESTDIR}${X11INCDIR}/X11/fonts \
-I${DESTDIR}${X11INCDIR}/freetype2 \
- -I${X11SRCDIR.Xfont}/src/stubs \
-DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
- -DPACKAGE_STRING="\"NetBSD tool bdftopcf 1.0.4\""
-
-.PATH: ${X11SRCDIR.Xfont}/src/bitmap
-SRCS+= bdfread.c bdfutils.c bitmap.c bitmaputil.c fontink.c \
- pcfread.c pcfwrite.c
-
-.PATH: ${X11SRCDIR.Xfont}/src/fontfile
-SRCS+= bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c
-
-.PATH: ${X11SRCDIR.Xfont}/src/util
-SRCS+= atom.c fontaccel.c private.c utilbitmap.c
+ -DPACKAGE_STRING="\"NetBSD tool bdftopcf 1.1\""
LDADD+= -lz
CVS commit: src/external/mit/xorg/tools/bdftopcf
Module Name:src Committed By: mrg Date: Sun Mar 11 11:01:08 UTC 2018 Modified Files: src/external/mit/xorg/tools/bdftopcf: Makefile Log Message: move the src list from libXfont stuff to local stuff. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/bdftopcf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: snj Date: Mon Feb 13 07:37:19 UTC 2017 Modified Files: src/external/mit/xorg/tools: Makefile Removed Files: src/external/mit/xorg/tools/xkbcomp: Makefile Makefile.xkbcomp xkbcomp-KeyBind.c xkbcomp-stubs.c xkbfile-xkbmisc.c Log Message: delete the xkbcomp tool now that nothing uses it To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.4 -r0 src/external/mit/xorg/tools/xkbcomp/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp \ src/external/mit/xorg/tools/xkbcomp/xkbcomp-KeyBind.c cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/tools/xkbcomp/xkbfile-xkbmisc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: snj Date: Mon Feb 13 07:37:19 UTC 2017 Modified Files: src/external/mit/xorg/tools: Makefile Removed Files: src/external/mit/xorg/tools/xkbcomp: Makefile Makefile.xkbcomp xkbcomp-KeyBind.c xkbcomp-stubs.c xkbfile-xkbmisc.c Log Message: delete the xkbcomp tool now that nothing uses it To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.4 -r0 src/external/mit/xorg/tools/xkbcomp/Makefile cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/xorg/tools/xkbcomp/Makefile.xkbcomp \ src/external/mit/xorg/tools/xkbcomp/xkbcomp-KeyBind.c cvs rdiff -u -r1.2 -r0 src/external/mit/xorg/tools/xkbcomp/xkbcomp-stubs.c cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/tools/xkbcomp/xkbfile-xkbmisc.c 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/tools/Makefile diff -u src/external/mit/xorg/tools/Makefile:1.7 src/external/mit/xorg/tools/Makefile:1.8 --- src/external/mit/xorg/tools/Makefile:1.7 Thu Jul 23 07:36:54 2015 +++ src/external/mit/xorg/tools/Makefile Mon Feb 13 07:37:19 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2015/07/23 07:36:54 mrg Exp $ +# $NetBSD: Makefile,v 1.8 2017/02/13 07:37:19 snj Exp $ .include @@ -11,7 +11,7 @@ # makekeys is now done src/tools SUBDIR+=bdftopcf fc-cache ucs2any -SUBDIR+=mkfontscale .WAIT xkbcomp +SUBDIR+=mkfontscale .include .include
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src Committed By: riastradh Date: Sun Feb 28 22:12:27 UTC 2016 Modified Files: src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: Define FC_NO_MT=1 for tools mkfontscale build. No idea what the host's atomic ops will be but we don't need them because this tool is not multithreaded. Fixes harmless warnings like all ===> external/mit/xorg/tools/mkfontscale /home/source/ab/HEAD-llvm/xsrc/external/mit/fontconfig/dist/src/fcinit.c:29:2: warning: #warning Could not find any system to define atomic_int macros, library may NOT be thread-safe. [-Wcpp] #warning Could not find any system to define atomic_int macros, library may NOT be thread-safe. ^ To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: riastradh
Date: Sun Feb 28 22:12:27 UTC 2016
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Define FC_NO_MT=1 for tools mkfontscale build.
No idea what the host's atomic ops will be but we don't need them
because this tool is not multithreaded.
Fixes harmless warnings like
all ===> external/mit/xorg/tools/mkfontscale
/home/source/ab/HEAD-llvm/xsrc/external/mit/fontconfig/dist/src/fcinit.c:29:2:
warning: #warning Could not find any system to define atomic_int macros,
library may NOT be thread-safe. [-Wcpp]
#warning Could not find any system to define atomic_int macros, library may
NOT be thread-safe.
^
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/tools/mkfontscale/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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.7 src/external/mit/xorg/tools/mkfontscale/Makefile:1.8
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.7 Thu Jul 23 08:03:26 2015
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Sun Feb 28 22:12:26 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2015/07/23 08:03:26 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2016/02/28 22:12:26 riastradh Exp $
NOMAN= 1
@@ -86,6 +86,11 @@ HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXF
-DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" \
-DPACKAGE_STRING=\"NetBSD\ tools\ version\"
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
+
+# If you make mkfontscale multithreaded, remove this and fix the
+# fontconfig atomic ops.
+HOST_CPPFLAGS+= -DFC_NO_MT=1
+
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: mrg Date: Thu Jul 23 07:36:55 UTC 2015 Modified Files: src/external/mit/xorg/tools: Makefile Removed Files: src/external/mit/xorg/tools/gen_matypes: Makefile Makefile.gen_matypes Log Message: remove obsolete tools and comments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/tools/gen_matypes/Makefile \ src/external/mit/xorg/tools/gen_matypes/Makefile.gen_matypes Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: mrg Date: Thu Jul 23 07:36:55 UTC 2015 Modified Files: src/external/mit/xorg/tools: Makefile Removed Files: src/external/mit/xorg/tools/gen_matypes: Makefile Makefile.gen_matypes Log Message: remove obsolete tools and comments. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/tools/Makefile cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/xorg/tools/gen_matypes/Makefile \ src/external/mit/xorg/tools/gen_matypes/Makefile.gen_matypes 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/tools/Makefile diff -u src/external/mit/xorg/tools/Makefile:1.6 src/external/mit/xorg/tools/Makefile:1.7 --- src/external/mit/xorg/tools/Makefile:1.6 Wed Jun 24 22:20:25 2015 +++ src/external/mit/xorg/tools/Makefile Thu Jul 23 07:36:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2015/06/24 22:20:25 matt Exp $ +# $NetBSD: Makefile,v 1.7 2015/07/23 07:36:54 mrg Exp $ .include bsd.own.mk @@ -9,8 +9,6 @@ # The rest of the tools can rely upon 'includes' -# XXX pswrap/gen_matypes -- missing - # makekeys is now done src/tools SUBDIR+=bdftopcf fc-cache ucs2any SUBDIR+=mkfontscale .WAIT xkbcomp
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src
Committed By: mrg
Date: Fri Jul 17 06:40:49 UTC 2015
Modified Files:
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
mkfontscale.c demands a PACKAGE_STRING now. set it to NetBSD tools version
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/mkfontscale/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/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.4 src/external/mit/xorg/tools/mkfontscale/Makefile:1.5
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.4 Wed Aug 10 10:34:48 2011
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Fri Jul 17 06:40:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/10 10:34:48 tsutsui Exp $
+# $NetBSD: Makefile,v 1.5 2015/07/17 06:40:49 mrg Exp $
NOMAN= 1
@@ -83,7 +83,8 @@ LDADD= -lz
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
- -DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
+ -DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\ \
+ -DPACKAGE_STRING=\NetBSD\ tools\ version\
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
CVS commit: src/external/mit/xorg/tools/mkfontscale
Module Name:src Committed By: mrg Date: Fri Jul 17 06:40:49 UTC 2015 Modified Files: src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: mkfontscale.c demands a PACKAGE_STRING now. set it to NetBSD tools version To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src Committed By: matt Date: Fri Jun 26 02:43:26 UTC 2015 Modified Files: src/external/mit/xorg/tools/makekeys: Makefile Log Message: Don't recreate link if clean or cleandir To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/makekeys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src
Committed By: matt
Date: Thu Jun 25 01:38:09 UTC 2015
Modified Files:
src/external/mit/xorg/tools/makekeys: Makefile
Log Message:
Make this work without a populated X11 include heirarchy. It's ugly
but it works.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makekeys/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/tools/makekeys/Makefile
diff -u src/external/mit/xorg/tools/makekeys/Makefile:1.2 src/external/mit/xorg/tools/makekeys/Makefile:1.3
--- src/external/mit/xorg/tools/makekeys/Makefile:1.2 Wed Jun 24 22:20:25 2015
+++ src/external/mit/xorg/tools/makekeys/Makefile Thu Jun 25 01:38:09 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/06/24 22:20:25 matt Exp $
+# $NetBSD: Makefile,v 1.3 2015/06/25 01:38:09 matt Exp $
NOMAN= 1
@@ -8,7 +8,31 @@ NOMAN= 1
PROG?= makekeys
SRCS= makekeys.c
+.if !make(obj) !exists(${DESTDIR}${X11INCDIR}/X.h)
+CLEANFILES+= X11
+CPPFLAGS+= -I.
+XPINCS= X.h Xarch.h Xos.h Xosdefs.h keysymdef.h
+X11INCS= Xlib.h Xresource.h
+CLEANFILES+= ${XPINCS} ${X11INCS} Xfuncproto.h
+.BEGIN:
+ @rm -f X11 ln -s . X11
+.for i in ${XPINCS}
+ @rm -f $i ln -s ${X11SRCDIR.xproto}/$i .
+.endfor
+.for i in ${X11INCS}
+ @rm -f $i ln -s ${X11SRCDIR.X11}/include/X11/$i .
+.endfor
+
+Xfuncproto.h: ${X11SRCDIR.xproto}/Xfuncproto.h.in
+ ${TOOL_SED} -e 's/#undef NARROWPROTO/#define NARROWPROTO/' \
+ -e 's/#undef FUNCPROTO/#define FUNCPROTO 15/' \
+ ${.ALLSRC} ${.TARGET}
+
+makekeys.lo makekeys.o makekeys.d: Xfuncproto.h
+
+.else
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
+.endif
.include bsd.x11.mk
.include bsd.prog.mk
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src Committed By: matt Date: Thu Jun 25 01:38:09 UTC 2015 Modified Files: src/external/mit/xorg/tools/makekeys: Makefile Log Message: Make this work without a populated X11 include heirarchy. It's ugly but it works. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makekeys/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/makestrs
Module Name:src
Committed By: christos
Date: Thu Jan 8 03:47:32 UTC 2015
Modified Files:
src/external/mit/xorg/tools/makestrs: Makefile
Log Message:
no need for the X headers anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makestrs/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/tools/makestrs/Makefile
diff -u src/external/mit/xorg/tools/makestrs/Makefile:1.2 src/external/mit/xorg/tools/makestrs/Makefile:1.3
--- src/external/mit/xorg/tools/makestrs/Makefile:1.2 Wed Jan 7 15:42:02 2015
+++ src/external/mit/xorg/tools/makestrs/Makefile Wed Jan 7 22:47:32 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/07 20:42:02 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/08 03:47:32 christos Exp $
NOMAN= 1
@@ -9,18 +9,4 @@ NOMAN= 1
HOSTPROG= makestrs
HOST_CPPFLAGS+= -I.
-.for header in Xos.h Xosdefs.h Xarch.h
-realdepend realall: X11/${header}
-
-X11/${header}:
- mkdir -p X11
- rm -f ${header}
- ln -s ${X11SRCDIR.xproto}/${header} X11/${header}
-.endfor
-
-clean_headers: .PHONY
- rm -rf X11
-
-cleandir: clean_headers
-
.include bsd.hostprog.mk
CVS commit: src/external/mit/xorg/tools/makestrs
Module Name:src Committed By: christos Date: Thu Jan 8 03:47:32 UTC 2015 Modified Files: src/external/mit/xorg/tools/makestrs: Makefile Log Message: no need for the X headers anymore. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/makestrs/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src
Committed By: mrg
Date: Thu Mar 20 08:05:30 UTC 2014
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
Log Message:
the host tool relies on scandir now days. (it tries to avoid it,
but needs work for this code to work again. if this is fixed, we
may want to run ./configure for this tool.)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/fc-cache/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.8 src/external/mit/xorg/tools/fc-cache/Makefile:1.9
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.8 Mon Jun 3 20:23:40 2013
+++ src/external/mit/xorg/tools/fc-cache/Makefile Thu Mar 20 08:05:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2013/06/03 20:23:40 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/20 08:05:30 mrg Exp $
NOMAN= 1
@@ -104,6 +104,7 @@ HOST_CPPFLAGS= -DFONTCONFIG_PATH='${DES
-DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON \
-DHAVE_SYS_TYPES_H -DHAVE_FCNTL_H -DHAVE_SYS_STAT_H \
-DHAVE_MKSTEMP \
+ -DHAVE_SCANDIR \
-DFLEXIBLE_ARRAY_MEMBER=/**/
HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
CVS commit: src/external/mit/xorg/tools/fc-cache
Module Name:src Committed By: mrg Date: Thu Mar 20 08:05:30 UTC 2014 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile Log Message: the host tool relies on scandir now days. (it tries to avoid it, but needs work for this code to work again. if this is fixed, we may want to run ./configure for this tool.) To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/xorg/tools/fc-cache/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/xkbcomp
Module Name:src
Committed By: mrg
Date: Fri May 31 23:43:05 UTC 2013
Modified Files:
src/external/mit/xorg/tools/xkbcomp: Makefile
Log Message:
define PACKAGE_STRING and PACKAGE_VERSION.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/xkbcomp/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/tools/xkbcomp/Makefile
diff -u src/external/mit/xorg/tools/xkbcomp/Makefile:1.3 src/external/mit/xorg/tools/xkbcomp/Makefile:1.4
--- src/external/mit/xorg/tools/xkbcomp/Makefile:1.3 Sat Aug 22 01:03:31 2009
+++ src/external/mit/xorg/tools/xkbcomp/Makefile Fri May 31 23:43:05 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/22 01:03:31 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/31 23:43:05 mrg Exp $
NOMAN= 1
@@ -34,7 +34,9 @@ HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR}
-I${X11SRCDIR.xkbfile}/include/X11/extensions \
-I${X11SRCDIR.${HOSTPROG}} \
-DDFLT_XKB_CONFIG_ROOT=\${X11LIBDIR}/xkb\ -DXKB \
- -DHAVE_STRCASECMP -DHAVE_STRDUP
+ -DHAVE_STRCASECMP -DHAVE_STRDUP \
+ -DPACKAGE_STRING=\NetBSD tool xkbcomp 1.2.4\ \
+ -DPACKAGE_VERSION=\1.2.4\
.include ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys
CVS commit: src/external/mit/xorg/tools/xkbcomp
Module Name:src Committed By: mrg Date: Fri May 31 23:43:05 UTC 2013 Modified Files: src/external/mit/xorg/tools/xkbcomp: Makefile Log Message: define PACKAGE_STRING and PACKAGE_VERSION. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/xkbcomp/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools
Module Name:src
Committed By: tsutsui
Date: Wed Aug 10 10:34:49 UTC 2011
Modified Files:
src/external/mit/xorg/tools/fc-cache: Makefile
src/external/mit/xorg/tools/mkfontscale: Makefile
Log Message:
Disable bzip2 support in freetype on xorg tools build.
Fixes PR xsrc/45223 (xorg tools build fails on CentOS due to
lack of bz2 support).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/fc-cache/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/mkfontscale/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/tools/fc-cache/Makefile
diff -u src/external/mit/xorg/tools/fc-cache/Makefile:1.4 src/external/mit/xorg/tools/fc-cache/Makefile:1.5
--- src/external/mit/xorg/tools/fc-cache/Makefile:1.4 Sat Jul 23 23:42:02 2011
+++ src/external/mit/xorg/tools/fc-cache/Makefile Wed Aug 10 10:34:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/07/23 23:42:02 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2011/08/10 10:34:48 tsutsui Exp $
NOMAN= 1
@@ -39,8 +39,8 @@
.PATH: ${FREETYPE}/src/gzip
SRCS.freetype+= ftgzip.c
-.PATH: ${FREETYPE}/src/bzip2
-SRCS.freetype+= ftbzip2.c
+#.PATH: ${FREETYPE}/src/bzip2
+#SRCS.freetype+= ftbzip2.c
.PATH: ${FREETYPE}/src/lzw
SRCS.freetype+= ftlzw.c
@@ -100,12 +100,14 @@
-DFT2_BUILD_LIBRARY \
-DXML_BYTE_ORDER=0 -DHAVE_MEMMOVE=1 \
-DHAVE_STDINT_H -DHAVE_RANDOM -DDARWIN_NO_CARBON
+HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FONTCONFIG} -I${FREETYPE} \
-I${FREETYPE}/include -I${EXPAT}/lib \
-I${FONTCONFIG}/../include \
-I${DESTDIR}${X11INCDIR} -I.
-LDADD= -lz -lbz2
+LDADD= -lz
+#LDADD+= -lbz2
FCARCH_DEPFILE= fc-cache.c
.include ../../lib/fontconfig/src/Makefile.fcarch
Index: src/external/mit/xorg/tools/mkfontscale/Makefile
diff -u src/external/mit/xorg/tools/mkfontscale/Makefile:1.3 src/external/mit/xorg/tools/mkfontscale/Makefile:1.4
--- src/external/mit/xorg/tools/mkfontscale/Makefile:1.3 Sat Jul 23 23:42:02 2011
+++ src/external/mit/xorg/tools/mkfontscale/Makefile Wed Aug 10 10:34:48 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/07/23 23:42:02 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2011/08/10 10:34:48 tsutsui Exp $
NOMAN= 1
@@ -31,8 +31,8 @@
.PATH: ${FREETYPE}/src/gzip
SRCS.freetype+= ftgzip.c
-.PATH: ${FREETYPE}/src/bzip2
-SRCS.freetype+= ftbzip2.c
+#.PATH: ${FREETYPE}/src/bzip2
+#SRCS.freetype+= ftbzip2.c
.PATH: ${FREETYPE}/src/lzw
SRCS.freetype+= ftlzw.c
@@ -78,11 +78,13 @@
SRCS+= ${SRCS.mkfontscale} ${SRCS.freetype} ${SRCS.fontenc}
-LDADD= -lz -lbz2
+LDADD= -lz
+#LDADD+= -lbz2
HOST_CPPFLAGS= -DFONTENC_NO_LIBFONT -DXFREE86_FT2 -DFONTENC_NO_LIBFONT \
-DFT2_BUILD_LIBRARY -DDARWIN_NO_CARBON \
-DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
+HOST_CPPFLAGS+= -DFT_CONFIG_OPTION_DISABLE_BZIP2
HOST_CPPFLAGS+= -I${FREETYPE}/include -I${DESTDIR}${X11INCDIR} \
-I${DESTDIR}${X11INCDIR}/freetype2
# -I${X11SRCDIR.xc}/include/fonts
CVS commit: src/external/mit/xorg/tools
Module Name:src Committed By: tsutsui Date: Wed Aug 10 10:34:49 UTC 2011 Modified Files: src/external/mit/xorg/tools/fc-cache: Makefile src/external/mit/xorg/tools/mkfontscale: Makefile Log Message: Disable bzip2 support in freetype on xorg tools build. Fixes PR xsrc/45223 (xorg tools build fails on CentOS due to lack of bz2 support). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/fc-cache/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/mkfontscale/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/bdftopcf
Module Name:src
Committed By: tsutsui
Date: Sun Dec 19 13:04:54 UTC 2010
Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile
Log Message:
Disable bzip2 support in tools bdftopcf(1).
We don't use bzip2 fonts on build and some OS doesn't have bzip2 headers.
Ok'ed by mrg@, martin@, fixes PR/44138.
Should be pulled up to netbsd-5 (and netbsd-5-1).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/bdftopcf/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.4 src/external/mit/xorg/tools/bdftopcf/Makefile:1.5
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.4 Sat Aug 14 11:12:16 2010
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Sun Dec 19 13:04:54 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/08/14 11:12:16 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/12/19 13:04:54 tsutsui Exp $
NOMAN= 1
@@ -16,7 +16,7 @@
-I${DESTDIR}${X11INCDIR}/X11/fonts \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-I${X11SRCDIR.Xfont}/src/stubs \
- -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION \
+ -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
-DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
.PATH: ${X11SRCDIR.Xfont}/src/bitmap
@@ -24,12 +24,12 @@
pcfread.c pcfwrite.c
.PATH: ${X11SRCDIR.Xfont}/src/fontfile
-SRCS+= bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c bunzip2.c
+SRCS+= bufio.c decompress.c defaults.c fileio.c filewr.c gunzip.c
.PATH: ${X11SRCDIR.Xfont}/src/util
SRCS+= atom.c fontaccel.c private.c utilbitmap.c
-LDADD+= -lz -lbz2
+LDADD+= -lz
.include bsd.x11.mk
.include bsd.hostprog.mk
CVS commit: src/external/mit/xorg/tools/bdftopcf
Module Name:src Committed By: tsutsui Date: Sun Dec 19 13:04:54 UTC 2010 Modified Files: src/external/mit/xorg/tools/bdftopcf: Makefile Log Message: Disable bzip2 support in tools bdftopcf(1). We don't use bzip2 fonts on build and some OS doesn't have bzip2 headers. Ok'ed by mrg@, martin@, fixes PR/44138. Should be pulled up to netbsd-5 (and netbsd-5-1). To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/tools/bdftopcf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src
Committed By: mrg
Date: Mon Nov 22 00:52:33 UTC 2010
Modified Files:
src/external/mit/xorg/tools/makekeys: Makefile.makekeys
Log Message:
makekeys can't read from stdin anymore; avoid it.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/tools/makekeys/Makefile.makekeys
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/tools/makekeys/Makefile.makekeys
diff -u src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.1.1.1 src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.2
--- src/external/mit/xorg/tools/makekeys/Makefile.makekeys:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/tools/makekeys/Makefile.makekeys Mon Nov 22 00:52:33 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.makekeys,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile.makekeys,v 1.2 2010/11/22 00:52:33 mrg Exp $
MAKEKEYSDIR!= cd ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys ${PRINTOBJDIR}
MAKEKEYS= ${MAKEKEYSDIR}/makekeys
@@ -14,4 +14,4 @@
ks_tables.h: ${MAKEKEYS} ${KSDEF}
${_MKTARGET_CREATE}
rm -f ${.TARGET}
- ${MAKEKEYS} ${KSDEF} ${.TARGET}
+ ${MAKEKEYS} ${KSDEF} ${.TARGET}
CVS commit: src/external/mit/xorg/tools/makekeys
Module Name:src Committed By: mrg Date: Mon Nov 22 00:52:33 UTC 2010 Modified Files: src/external/mit/xorg/tools/makekeys: Makefile.makekeys Log Message: makekeys can't read from stdin anymore; avoid it. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/tools/makekeys/Makefile.makekeys Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/bdftopcf
Module Name:src Committed By: mrg Date: Sat Aug 14 11:12:16 UTC 2010 Modified Files: src/external/mit/xorg/tools/bdftopcf: Makefile Log Message: don't need (or want) miscutil.c here anymore. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/tools/bdftopcf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/tools/xkbcomp
Module Name:src
Committed By: mrg
Date: Sat Aug 22 01:03:31 UTC 2009
Modified Files:
src/external/mit/xorg/tools/xkbcomp: Makefile
Log Message:
enable strcasecmp() and strdup().
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/tools/xkbcomp/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/tools/xkbcomp/Makefile
diff -u src/external/mit/xorg/tools/xkbcomp/Makefile:1.2 src/external/mit/xorg/tools/xkbcomp/Makefile:1.3
--- src/external/mit/xorg/tools/xkbcomp/Makefile:1.2 Tue Feb 3 05:08:39 2009
+++ src/external/mit/xorg/tools/xkbcomp/Makefile Sat Aug 22 01:03:31 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/02/03 05:08:39 dbj Exp $
+# $NetBSD: Makefile,v 1.3 2009/08/22 01:03:31 mrg Exp $
NOMAN= 1
@@ -33,7 +33,8 @@
-I${X11SRCDIR.X11}/src/xkb \
-I${X11SRCDIR.xkbfile}/include/X11/extensions \
-I${X11SRCDIR.${HOSTPROG}} \
- -DDFLT_XKB_CONFIG_ROOT=\${X11LIBDIR}/xkb\ -DXKB
+ -DDFLT_XKB_CONFIG_ROOT=\${X11LIBDIR}/xkb\ -DXKB \
+ -DHAVE_STRCASECMP -DHAVE_STRDUP
.include ${NETBSDSRCDIR}/external/mit/xorg/tools/makekeys/Makefile.makekeys
CVS commit: src/external/mit/xorg/tools/bdftopcf
Module Name:src
Committed By: mrg
Date: Wed Jun 10 02:01:39 UTC 2009
Modified Files:
src/external/mit/xorg/tools/bdftopcf: Makefile
Log Message:
enable bz2 support.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/xorg/tools/bdftopcf/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/tools/bdftopcf/Makefile
diff -u src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1 src/external/mit/xorg/tools/bdftopcf/Makefile:1.2
--- src/external/mit/xorg/tools/bdftopcf/Makefile:1.1.1.1 Tue Jul 29 05:01:23 2008
+++ src/external/mit/xorg/tools/bdftopcf/Makefile Wed Jun 10 02:01:39 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/10 02:01:39 mrg Exp $
NOMAN= 1
@@ -16,7 +16,7 @@
-I${DESTDIR}${X11INCDIR}/X11/fonts \
-I${DESTDIR}${X11INCDIR}/freetype2 \
-I${X11SRCDIR.Xfont}/src/stubs \
- -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \
+ -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION \
-DFONT_ENCODINGS_DIRECTORY=\${X11FONTDIR}/encodings/encodings.dir\
.PATH: ${X11SRCDIR.Xfont}/src/bitmap
