head	1.14;
access;
symbols
	netbsd-11-0-RC4:1.13
	netbsd-11-0-RC3:1.13
	netbsd-11-0-RC2:1.13
	netbsd-11-0-RC1:1.13
	perseant-exfatfs-base-20250801:1.13
	netbsd-11:1.13.0.2
	netbsd-11-base:1.13
	netbsd-10-1-RELEASE:1.11
	perseant-exfatfs-base-20240630:1.11
	perseant-exfatfs:1.11.0.4
	perseant-exfatfs-base:1.11
	netbsd-9-4-RELEASE:1.5
	netbsd-10-0-RELEASE:1.11
	netbsd-10-0-RC6:1.11
	netbsd-10-0-RC5:1.11
	netbsd-10-0-RC4:1.11
	netbsd-10-0-RC3:1.11
	netbsd-10-0-RC2:1.11
	netbsd-10-0-RC1:1.11
	netbsd-10:1.11.0.2
	netbsd-10-base:1.11
	netbsd-9-3-RELEASE:1.5
	cjep_sun2x-base1:1.7
	cjep_sun2x:1.7.0.4
	cjep_sun2x-base:1.7
	cjep_staticlib_x-base1:1.7
	netbsd-9-2-RELEASE:1.5
	cjep_staticlib_x:1.7.0.2
	cjep_staticlib_x-base:1.7
	netbsd-9-1-RELEASE:1.5
	phil-wifi-20200421:1.6
	phil-wifi-20200411:1.6
	is-mlppp:1.6.0.2
	is-mlppp-base:1.6
	phil-wifi-20200406:1.6
	netbsd-9-0-RELEASE:1.5
	netbsd-9-0-RC2:1.5
	netbsd-9-0-RC1:1.5
	phil-wifi-20191119:1.5
	netbsd-9:1.5.0.2
	netbsd-9-base:1.5
	phil-wifi-20190609:1.5
	pgoyette-compat-merge-20190127:1.3.2.4
	pgoyette-compat-20190127:1.5
	pgoyette-compat-20190118:1.5
	pgoyette-compat-1226:1.5
	pgoyette-compat-1126:1.5
	pgoyette-compat-1020:1.5
	pgoyette-compat-0930:1.5
	pgoyette-compat-0906:1.5
	pgoyette-compat-0728:1.4
	phil-wifi:1.4.0.2
	phil-wifi-base:1.4
	pgoyette-compat-0625:1.4
	pgoyette-compat-0521:1.4
	pgoyette-compat-0502:1.3
	pgoyette-compat-0422:1.3
	pgoyette-compat-0415:1.3
	pgoyette-compat-0407:1.3
	pgoyette-compat-0330:1.3
	pgoyette-compat-0322:1.3
	pgoyette-compat:1.3.0.2
	pgoyette-compat-0315:1.3;
locks; strict;
comment	@# @;


1.14
date	2025.10.20.14.31.39;	author nat;	state Exp;
branches;
next	1.13;
commitid	ca2vu1EwZoT0HjfG;

1.13
date	2025.05.06.13.00.40;	author rin;	state Exp;
branches;
next	1.12;
commitid	pWbgsaolOYoUxQTF;

1.12
date	2024.11.15.06.38.14;	author mrg;	state Exp;
branches;
next	1.11;
commitid	3frkSD3v9zfSYHxF;

1.11
date	2022.10.28.09.43.58;	author wiz;	state Exp;
branches
	1.11.4.1;
next	1.10;
commitid	R4wMU7jTgxDL4tZD;

1.10
date	2022.09.14.07.37.05;	author mrg;	state Exp;
branches;
next	1.9;
commitid	Cz69RdKMZEZdNNTD;

1.9
date	2022.09.09.03.56.39;	author mrg;	state Exp;
branches;
next	1.8;
commitid	glDhTvlZPO1NJ8TD;

1.8
date	2021.11.16.09.25.51;	author nia;	state Exp;
branches;
next	1.7;
commitid	ZhN9fVPgGjpz60hD;

1.7
date	2021.04.13.04.59.00;	author mrg;	state Exp;
branches;
next	1.6;
commitid	GPm3Uyz2p2ylB5PC;

1.6
date	2020.02.23.09.24.12;	author mrg;	state Exp;
branches;
next	1.5;
commitid	fKfFyiaHCgdupMXB;

1.5
date	2018.08.03.02.23.09;	author kamil;	state Exp;
branches;
next	1.4;
commitid	XgX8yQH7bpmnmCMA;

1.4
date	2018.05.09.08.39.54;	author mrg;	state Exp;
branches
	1.4.2.1;
next	1.3;
commitid	McRhUICBhNRGdBBA;

1.3
date	2018.03.13.02.23.28;	author mrg;	state Exp;
branches
	1.3.2.1;
next	1.2;
commitid	0x4dIDsHilobYeuA;

1.2
date	2018.03.11.10.17.10;	author mrg;	state Exp;
branches;
next	1.1;
commitid	axWJ07L4BwVAE1uA;

1.1
date	2018.03.11.09.43.38;	author mrg;	state Exp;
branches;
next	;
commitid	q3ECsrpRY8s9t1uA;

1.11.4.1
date	2025.08.02.05.50.42;	author perseant;	state Exp;
branches;
next	;
commitid	23j6GFaDws3O875G;

1.4.2.1
date	2019.06.10.22.02.40;	author christos;	state Exp;
branches;
next	1.4.2.2;
commitid	jtc8rnCzWiEEHGqB;

1.4.2.2
date	2020.04.08.14.07.02;	author martin;	state Exp;
branches;
next	;
commitid	Qli2aW9E74UFuA3C;

1.3.2.1
date	2018.03.13.02.23.28;	author pgoyette;	state dead;
branches;
next	1.3.2.2;
commitid	lb7w3QtkrVH4axuA;

1.3.2.2
date	2018.03.15.09.11.59;	author pgoyette;	state Exp;
branches;
next	1.3.2.3;
commitid	lb7w3QtkrVH4axuA;

1.3.2.3
date	2018.05.21.04.35.54;	author pgoyette;	state Exp;
branches;
next	1.3.2.4;
commitid	X5L8kSrBWQcDt7DA;

1.3.2.4
date	2018.09.06.06.53.50;	author pgoyette;	state Exp;
branches;
next	;
commitid	HCi1bXD317XIK0RA;


desc
@@


1.14
log
@New port: mac68ksf - Macintosh 68k softfloat.

This commit is all the Makefile glue for the new port which is the mac68k
port with MKSOFTFLOAT set to "yes".

As posted here:
https://mail-index.netbsd.org/port-mac68k/2025/10/14/msg001037.html
@
text
@#	$NetBSD: Makefile,v 1.13 2025/05/06 13:00:40 rin Exp $

USE_FORT?=	yes # data-driven bugs?

.include <bsd.own.mk>

LIB=	Xfont2
XFONT2DIR= ${X11SRCDIR.${LIB}}

SHLIB_MAJOR=	2
SHLIB_MINOR=	0

.PATH:	${XFONT2DIR}/include/X11/fonts
.PATH:	${XFONT2DIR}/../include

SRCS.stubs=	\
	atom.c \
	libxfontstubs.c
.PATH:	${XFONT2DIR}/src/stubs

SRCS.util=	\
	fontaccel.c \
	fontnames.c \
	fontutil.c \
	fontxlfd.c \
	format.c \
	miscutil.c \
	patcache.c \
	private.c \
	utilbitmap.c \
	reallocarray.c
.PATH:	${XFONT2DIR}/src/util

SRCS.fontfile=	\
	bitsource.c \
	bufio.c \
	decompress.c \
	defaults.c \
	dirfile.c \
	fileio.c \
	filewr.c \
	fontdir.c \
	fontencc.c \
	fontfile.c \
	fontscale.c \
	gunzip.c \
	register.c \
	renderers.c \
	catalogue.c \
	bunzip2.c
.PATH:	${XFONT2DIR}/src/fontfile

SRCS.FreeType=	\
	ftenc.c \
	ftfuncs.c \
	fttools.c \
	xttcap.c
.PATH:	${XFONT2DIR}/src/FreeType

SRCS.bitmap=	\
	bitmap.c \
	bitmapfunc.c \
	bitmaputil.c \
	bitscale.c \
	fontink.c \
	bitmap.c \
	bitmapfunc.c \
	bitmaputil.c \
	bitscale.c \
	fontink.c \
	bdfread.c \
	bdfutils.c \
	pcfread.c
SRCS.bitmap+=	\
	pcfwrite.c
# SNF support not enabled
.if 0
SRCS.bitmap+=	\
	snfread.c
.endif
.PATH:	${XFONT2DIR}/src/bitmap

SRCS.builtins=	\
	dir.c \
	file.c \
	fonts.c \
	fpe.c \
	render.c
.PATH:	${XFONT2DIR}/src/builtins

SRCS.fc=	\
	fsconvert.c \
	fserve.c \
	fsio.c \
	fstrans.c
.PATH:	${XFONT2DIR}/src/fc

.for dir in stubs util fontfile FreeType bitmap builtins fc
SRCS+=	${SRCS.${dir}}
.endfor

INCS=	libxfont2.h
INCSDIR=${X11INCDIR}/X11/fonts

CPPFLAGS+=	${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
CPPFLAGS+=	-DHAVE_STRLCPY
CPPFLAGS+=	-DHAVE_REALLOCARRAY
CPPFLAGS+=	-DHAVE_READLINK
CPPFLAGS+=	-DHAVE_STDINT_H
CPPFLAGS+=	-DHAVE_STRLCPY
CPPFLAGS+=	-DHAVE_ERR_H
CPPFLAGS+=	-DHAVE_REALPATH
CPPFLAGS+=	-DHAVE_FLOAT_H
CPPFLAGS+=	-DXFONT_BDFFORMAT
CPPFLAGS+=	-DXFONT_BITMAP
CPPFLAGS+=	-DXFONT_BUILTINS
CPPFLAGS+=	-DXFONT_FC
CPPFLAGS+=	-DXFONT_FONTFILE
CPPFLAGS+=	-DXFONT_FREETYPE
CPPFLAGS+=	-DXFONT_PCFFORMAT
CPPFLAGS+=	-DX_GZIP_FONT_COMPRESSION
CPPFLAGS+=	-DX_BZIP2_FONT_COMPRESSION
CPPFLAGS+=	-DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\" 
CPPFLAGS+=	-I${XFONT2DIR}/src/stubs
CPPFLAGS+=	-I${XFONT2DIR}
CPPFLAGS+=	-I${XFONT2DIR}/include
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/fonts
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2/freetype

CWARNFLAGS.clang+=	-Wno-format
COPTS.ftfuncs.c+=	${${ACTIVE_CC} == "gcc" && ${HAVE_GCC:U0} >= 10:? -Wno-error=overflow :}

.if ${HAVE_GCC:U0} >= 12 && ${MACHINE_ARCH:S/m68ksf/m68k/} == "m68k"
COPTS.fontxlfd.c+=	-fno-stack-protector
.endif

LIBDPLIBS=\
	Xt	${.CURDIR}/../libXt \
	SM	${.CURDIR}/../libSM \
	ICE	${.CURDIR}/../libICE \
	Xext	${.CURDIR}/../libXext \
	fontenc	${.CURDIR}/../libfontenc \
	freetype	${.CURDIR}/../freetype \
	X11	${.CURDIR}/../libX11/dynamic \
	m	${.CURDIR}/../../../../../lib/libm \
	z	${.CURDIR}/../../../../../lib/libz \
	bz2	${.CURDIR}/../../../../../lib/libbz2

PKGDIST=	${LIB}

PKGCONFIG_SED_FLAGS= \
	-e "s,@@Z_REQUIRES@@,zlib,"

.include <bsd.x11.mk>
.include <bsd.lib.mk>
@


1.13
log
@libXfont2: GCC12: m68k: Sprinkle -fno-stack-protector to fontxlfd.c

Considering X just worked fine back to 2023, this should be
due to libXfont2-2.0.7 update.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.12 2024/11/15 06:38:14 mrg Exp $
d135 1
a135 1
.if ${HAVE_GCC:U0} >= 12 && ${MACHINE_ARCH} == "m68k"
@


1.12
log
@define HAVE_FLOAT_H for upcoming libXfont2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.11 2022/10/28 09:43:58 wiz Exp $
d135 4
@


1.11
log
@put reallocarray() in the public namespace

reallocarray() will be part of the next POSIX release, see
https://austingroupbugs.net/view.php?id=1218

adapt an errno value to match POSIX expectations

As discussed on tech-userlevel
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2022/09/14 07:37:05 mrg Exp $
d113 1
@


1.11.4.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.13 2025/05/06 13:00:40 rin Exp $
a112 1
CPPFLAGS+=	-DHAVE_FLOAT_H
a133 4
.if ${HAVE_GCC:U0} >= 12 && ${MACHINE_ARCH} == "m68k"
COPTS.fontxlfd.c+=	-fno-stack-protector
.endif

@


1.10
log
@fix defines no longer provided by config.h.

fixes eg, missing "10x20" font for me, but does require fc-cache
and X restarting to fix.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.9 2022/09/09 03:56:39 mrg Exp $
d107 1
a107 1
CPPFLAGS+=	-DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
@


1.9
log
@updates for libXfont2 2.0.6.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.8 2021/11/16 09:25:51 nia Exp $
d106 1
a106 1
CPPFLAGS+=	-DHAS_SNPRINTF
d113 9
a121 2
CPPFLAGS+=	-DHAS_SNPRINTF
CPPFLAGS+=      -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
a125 1
CPPFLAGS+=	-I${XFONT2DIR}/../include
@


1.8
log
@xorg: sprinkle a little bit of USE_FORT around
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.7 2021/04/13 04:59:00 mrg Exp $
d106 8
a113 1
CPPFLAGS+=	-DHAS_SNPRINTF -DHAVE_CONFIG_H
d142 3
@


1.7
log
@apply some -Wno- to ignore several new warnings with GCC 10.


ntp: ignore truncation beyond api sizes, and ignore wrongly
guessed underflow

tmux: ignore maybe uninitialised warning for impossible case

libbfd: signed/unsigned variables assigned in the same statement

dri/gallium: -Wno-builtin-declaration-mismatch for u_atomic.c as
it implements backend functions with different in-C-machine but
same-in-real-machine types

libXfont/libXfont2: signed/unsigned variables assigned in the same
statement

i915drm: ignore impossible maybe uninitialised warnings

sysinst: ignore an invalid string truncation issue
@
text
@d1 3
a3 1
#	$NetBSD: Makefile,v 1.6 2020/02/23 09:24:12 mrg Exp $
@


1.6
log
@fix libXfont2 build, and (for now) remove new XvMCW pkg-config file.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2018/08/03 02:23:09 kamil Exp $
d117 1
@


1.5
log
@Fix libXfont2 build with Clang/LLVM on i386

The code uses non-orthodox types in format strings.
Add a compiler flag to disable a warning that is turned into a fatal error.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2018/05/09 08:39:54 mrg Exp $
d28 2
a29 1
	utilbitmap.c
d108 1
@


1.4
log
@add freetype2/freetype to the include path.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.3 2018/03/13 02:23:28 mrg Exp $
d114 2
@


1.4.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2018/08/03 02:23:09 kamil Exp $
a113 2
CWARNFLAGS.clang+=	-Wno-format

@


1.4.2.2
log
@Merge changes from current as of 20200406
@
text
@d1 1
a1 1
#	$NetBSD$
d28 1
a28 2
	utilbitmap.c \
	reallocarray.c
a106 1
CPPFLAGS+=	-I${XFONT2DIR}
@


1.3
log
@add missing pcfwrite.c.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.2 2018/03/11 10:17:10 mrg Exp $
d112 1
@


1.3.2.1
log
@file Makefile was added on branch pgoyette-compat on 2018-03-15 09:11:59 +0000
@
text
@d1 128
@


1.3.2.2
log
@Synch with HEAD
@
text
@a0 128
#	$NetBSD: Makefile,v 1.3 2018/03/13 02:23:28 mrg Exp $

.include <bsd.own.mk>

LIB=	Xfont2
XFONT2DIR= ${X11SRCDIR.${LIB}}

SHLIB_MAJOR=	2
SHLIB_MINOR=	0

.PATH:	${XFONT2DIR}/include/X11/fonts
.PATH:	${XFONT2DIR}/../include

SRCS.stubs=	\
	atom.c \
	libxfontstubs.c
.PATH:	${XFONT2DIR}/src/stubs

SRCS.util=	\
	fontaccel.c \
	fontnames.c \
	fontutil.c \
	fontxlfd.c \
	format.c \
	miscutil.c \
	patcache.c \
	private.c \
	utilbitmap.c
.PATH:	${XFONT2DIR}/src/util

SRCS.fontfile=	\
	bitsource.c \
	bufio.c \
	decompress.c \
	defaults.c \
	dirfile.c \
	fileio.c \
	filewr.c \
	fontdir.c \
	fontencc.c \
	fontfile.c \
	fontscale.c \
	gunzip.c \
	register.c \
	renderers.c \
	catalogue.c \
	bunzip2.c
.PATH:	${XFONT2DIR}/src/fontfile

SRCS.FreeType=	\
	ftenc.c \
	ftfuncs.c \
	fttools.c \
	xttcap.c
.PATH:	${XFONT2DIR}/src/FreeType

SRCS.bitmap=	\
	bitmap.c \
	bitmapfunc.c \
	bitmaputil.c \
	bitscale.c \
	fontink.c \
	bitmap.c \
	bitmapfunc.c \
	bitmaputil.c \
	bitscale.c \
	fontink.c \
	bdfread.c \
	bdfutils.c \
	pcfread.c
SRCS.bitmap+=	\
	pcfwrite.c
# SNF support not enabled
.if 0
SRCS.bitmap+=	\
	snfread.c
.endif
.PATH:	${XFONT2DIR}/src/bitmap

SRCS.builtins=	\
	dir.c \
	file.c \
	fonts.c \
	fpe.c \
	render.c
.PATH:	${XFONT2DIR}/src/builtins

SRCS.fc=	\
	fsconvert.c \
	fserve.c \
	fsio.c \
	fstrans.c
.PATH:	${XFONT2DIR}/src/fc

.for dir in stubs util fontfile FreeType bitmap builtins fc
SRCS+=	${SRCS.${dir}}
.endfor

INCS=	libxfont2.h
INCSDIR=${X11INCDIR}/X11/fonts

CPPFLAGS+=	${X11FLAGS.THREADLIB} ${X11FLAGS.CONNECTION}
CPPFLAGS+=	-DHAS_SNPRINTF -DHAVE_CONFIG_H
CPPFLAGS+=      -DBDFFORMAT -DSNFFORMAT -DPCFFORMAT -DX_GZIP_FONT_COMPRESSION -DX_BZIP2_FONT_COMPRESSION
CPPFLAGS+=	-DFONT_ENCODINGS_DIRECTORY=\"${X11LIBDIR}/X11/fonts/encodings/encodings.dir\" 
CPPFLAGS+=	-I${XFONT2DIR}/src/stubs
CPPFLAGS+=	-I${XFONT2DIR}/include
CPPFLAGS+=	-I${XFONT2DIR}/../include
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11/fonts
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2

LIBDPLIBS=\
	Xt	${.CURDIR}/../libXt \
	SM	${.CURDIR}/../libSM \
	ICE	${.CURDIR}/../libICE \
	Xext	${.CURDIR}/../libXext \
	fontenc	${.CURDIR}/../libfontenc \
	freetype	${.CURDIR}/../freetype \
	X11	${.CURDIR}/../libX11/dynamic \
	m	${.CURDIR}/../../../../../lib/libm \
	z	${.CURDIR}/../../../../../lib/libz \
	bz2	${.CURDIR}/../../../../../lib/libbz2

PKGDIST=	${LIB}

.include <bsd.x11.mk>
.include <bsd.lib.mk>
@


1.3.2.3
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.4 2018/05/09 08:39:54 mrg Exp $
a111 1
CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/freetype2/freetype
@


1.3.2.4
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.5 2018/08/03 02:23:09 kamil Exp $
a113 2
CWARNFLAGS.clang+=	-Wno-format

@


1.2
log
@fix libXfont2 sources list.  update for xfs 1.2.0.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.1 2018/03/11 09:43:38 mrg Exp $
d71 3
a75 1
	pcfwrite.c \
@


1.1
log
@build and install libXfont2.
@
text
@d1 1
a1 1
#	$NetBSD: Makefile,v 1.10 2015/02/25 20:01:39 snj Exp $
d58 10
a67 4
	ftenc.c \
	ftfuncs.c \
	fttools.c \
	xttcap.c \
d70 3
a72 1
	pcfread.c \
d75 1
@