Attachment #226941 for bug #251512




# Created by: jseger@FreeBSD.org

PORTNAME=	freetype2
DISTVERSION=	2.11.0
CATEGORIES=	print
MASTER_SITES=	SAVANNAH/${PORTNAME:S/2//} \
		SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/
DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}
		http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
		http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
		ftp://ftp.freetype.org/freetype/freetype2/
DISTNAME=	${PORTNAME:S/2//}-${PORTVERSION}

MAINTAINER=	desktop@FreeBSD.org
COMMENT=	Free and portable TrueType font rendering engine

LICENSE_FILE_GPLv2+ =	${WRKSRC}/docs/GPLv2.TXT
LICENSE_PERMS_FTL=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES=		cmake cpe localbase pathfix pkgconfig tar:xz

CPE_PRODUCT=	freetype
CPE_VENDOR=	freetype
USE_LDCONFIG=	yes

CMAKE_ON=	BUILD_SHARED_LIBS \
		FT_WITH_BZIP2 \
		CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz \
		FT_WITH_ZLIB

CMAKE_OFF=	FT_WITH_HARFBUZZ

SUB_FILES=	pkg-message

PORTDOCS=	CHANGES FTL.TXT formats.txt raster.txt reference

OPTIONS_DEFINE=		BROTLI DEBUG DOCS LONG_PCF_NAMES PNG TABLE_VALIDATION
OPTIONS_DEFAULT=	LCD_RENDERING LONG_PCF_NAMES PNG V40
OPTIONS_SUB=		yes

OPTIONS_SINGLE=		RENDERING
OPTIONS_SINGLE_RENDERING=	LCD_FILTERING LCD_RENDERING

OPTIONS_DEFINE=		BROTLI CONFIG DEBUG DOCS LONG_PCF_NAMES PNG \
		TABLE_VALIDATION
OPTIONS_GROUP=		SUBPIXEL_HINTING
OPTIONS_GROUP_SUBPIXEL_HINTING=	V38 V40

OPTIONS_SINGLE_RENDERING=	LCD_FILTERING LCD_RENDERING
OPTIONS_RADIO=		SIZE_METRICS_CHOICE
OPTIONS_RADIO_SIZE_METRICS_CHOICE=	FIX_SIZE_METRICS TT_SIZE_METRICS
OPTIONS_DEFAULT=	CONFIG LCD_RENDERING LONG_PCF_NAMES PNG V40
OPTIONS_SUB=	yes

BROTLI_CONFIGURE_WITH=	brotli
BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
BROTLI_USES=		pkgconfig
CONFIG_DESC=	Install freetype-config
CONFIG_CONFIGURE_ENABLE=freetype-config
PNG_DESC=		Png compressed OpenType embedded bitmaps support
PNG_LIB_DEPENDS=	libpng.so:graphics/png
PNG_CONFIGURE_WITH=	png

LONG_PCF_NAMES_DESC=	Enable long PCF family names
TABLE_VALIDATION_DESC=	TrueType GX/AAT and OpenType table validation
RENDERING_DESC=		Rendering technology
LCD_FILTERING_DESC=	Subpixel rendering (patented)
LCD_RENDERING_DESC=	Harmony LCD rendering
SUBPIXEL_HINTING_DESC=	Subpixel hinting support
V38_DESC=		v38 mode (Infinality code)
V40_DESC=		v40 mode (minimal code, a.k.a. ClearType hinting, faster)
SIZE_METRICS_CHOICE_DESC=	Size metrics for TrueType fonts
FIX_SIZE_METRICS_DESC=	Fix metrics on size request for scalable fonts (alternative method)
FIX_SIZE_METRICS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-fix_size_metrics.diff
TT_SIZE_METRICS_DESC=	TrueType-like size metrics for 'light' auto-hinting

BROTLI_LIB_DEPENDS=	libbrotlidec.so:archivers/brotli
BROTLI_CMAKE_BOOL=	FT_WITH_BROTLI
BROTLI_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_BrotliDec
LCD_RENDERING_DESC=	Harmony LCD rendering

PNG_LIB_DEPENDS=	libpng.so:graphics/png
PNG_CMAKE_BOOL=		FT_WITH_PNG
PNG_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_PNG

LCD_FILTERING_CFLAGS=	-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING

SUBPIXEL_HINTING_DESC=	Subpixel hinting support
V38_DESC=	v38 mode (Infinality code)
V38_VARS=	SUBPIXEL_HINTING_MODE+=1
V40_DESC=	v40 mode (minimal code, a.k.a. ClearType hinting, faster)
V40_VARS=	SUBPIXEL_HINTING_MODE+=2

FIX_SIZE_METRICS_EXTRA_PATCHES=	${FILESDIR}/extra-patch-fix_size_metrics.diff

.include <bsd.port.pre.mk>

SELECTED_MODE=	\

	done; \
	${ECHO_CMD} $$r

pre-patch:
	@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
		${WRKSRC}/builds/unix/install.mk

post-patch:
.if defined(SUBPIXEL_HINTING_MODE)
	@${REINPLACE_CMD} -i '.hinting.bak' \

		-e 's|.*\(#define AF_CONFIG_OPTION_TT_SIZE_METRICS\).*|\1|' \
		${WRKSRC}/include/freetype/config/ftoption.h

post-configure:
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.*

post-install-DOCS-on:
	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})


Lines 1-3 Link Here

(-)b/print/freetype2/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1603355758	1	TIMESTAMP = 1627838448
2	SHA256 (freetype-2.10.4.tar.xz) = 86a854d8905b19698bbc8f23b860bc104246ce4854dcea8e3b0fb21284f75784	2	SHA256 (freetype-2.11.0.tar.xz) = 8bee39bd3968c4804b70614a0a3ad597299ad0e824bc8aad5ce8aaf48067bde7
3	SIZE (freetype-2.10.4.tar.xz) = 2416620	3	SIZE (freetype-2.11.0.tar.xz) = 2256640




--- builds/unix/detect.mk.orig	2019-02-23 09:06:06 UTC
+++ builds/unix/detect.mk
@@ -22,6 +22,9 @@ ifeq ($(PLATFORM),ansi)
                      $(wildcard /usr/sbin/init) \
                      $(wildcard /dev/null) \
                      $(wildcard /hurd/auth))
+  # FreeBSD is "unix" so just mandate this to fix the build in
+  # jails that do not have init (see PR#113470).
+  is_unix := true
   ifneq ($(is_unix),)
 
     PLATFORM := unix
@@ -86,10 +89,10 @@ ifeq ($(PLATFORM),unix)
   ifdef must_configure
     ifneq ($(have_Makefile),)
       # we are building FT2 not in the src tree
-	        $(TOP_DIR)/builds/unix/configure $(value CFG)
+#	        $(TOP_DIR)/builds/unix/configure $(value CFG)
     else
-	      cd builds/unix; \
-	        ./configure $(value CFG)
+#	      cd builds/unix; \
+#	        ./configure $(value CFG)
     endif
   endif
 

Lines 30-36 if needed: Link Here

(-)b/print/freetype2/files/pkg-message.in (-1 / +1 lines)
30		30
31	The controllable properties are listed in the section "Controlling FreeType	31	The controllable properties are listed in the section "Controlling FreeType
32	Modules" in the reference's table of contents	32	Modules" in the reference's table of contents
33	(%%DOCSDIR%%/reference/site/index.html, if documentation was installed).	33	(%%DOCSDIR%%/reference/index.html, if documentation was installed).
34	EOM	34	EOM
35	}	35	}
36	]	36	]

Lines 1-4 Link Here

(-)b/print/freetype2/pkg-plist (-5 / +7 lines)
1	%%CONFIG%%bin/freetype-config	1	include/freetype2/dlg/dlg.h
		2	include/freetype2/dlg/output.h
2	include/freetype2/freetype/config/ftconfig.h	3	include/freetype2/freetype/config/ftconfig.h
3	include/freetype2/freetype/config/ftheader.h	4	include/freetype2/freetype/config/ftheader.h
4	include/freetype2/freetype/config/ftmodule.h	5	include/freetype2/freetype/config/ftmodule.h
Lines 29-34 include/freetype2/freetype/ftimage.h Link Here
29	include/freetype2/freetype/ftincrem.h	30	include/freetype2/freetype/ftincrem.h
30	include/freetype2/freetype/ftlcdfil.h	31	include/freetype2/freetype/ftlcdfil.h
31	include/freetype2/freetype/ftlist.h	32	include/freetype2/freetype/ftlist.h
		33	include/freetype2/freetype/ftlogging.h
32	include/freetype2/freetype/ftlzw.h	34	include/freetype2/freetype/ftlzw.h
33	include/freetype2/freetype/ftmac.h	35	include/freetype2/freetype/ftmac.h
34	include/freetype2/freetype/ftmm.h	36	include/freetype2/freetype/ftmm.h
Lines 52-61 include/freetype2/freetype/ttnameid.h Link Here
52	include/freetype2/freetype/tttables.h	54	include/freetype2/freetype/tttables.h
53	include/freetype2/freetype/tttags.h	55	include/freetype2/freetype/tttags.h
54	include/freetype2/ft2build.h	56	include/freetype2/ft2build.h
55	lib/libfreetype.a	57	lib/cmake/freetype/freetype-config-%%CMAKE_BUILD_TYPE%%.cmake
		58	lib/cmake/freetype/freetype-config-version.cmake
		59	lib/cmake/freetype/freetype-config.cmake
56	lib/libfreetype.so	60	lib/libfreetype.so
57	lib/libfreetype.so.6	61	lib/libfreetype.so.6
58	lib/libfreetype.so.6.17.4	62	lib/libfreetype.so.6.18.0
59	libdata/pkgconfig/freetype2.pc	63	libdata/pkgconfig/freetype2.pc
60	%%CONFIG%%man/man1/freetype-config.1.gz
61	share/aclocal/freetype2.m4

Return to bug 251512

Lines 1-15 Link Here

(-)b/print/freetype2/Makefile (-52 / +40 lines)
1	# Created by: jseger@FreeBSD.org	1	# Created by: jseger@FreeBSD.org
2		2
3	PORTNAME= freetype2	3	PORTNAME= freetype2
4	DISTVERSION= 2.10.4	4	DISTVERSION= 2.11.0
5	CATEGORIES= print	5	CATEGORIES= print
6	MASTER_SITES= http://savannah.nongnu.org/download/freetype/ \	6	MASTER_SITES= SAVANNAH/${PORTNAME:S/2//} \
7	SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/ \	7	SF/freetype/${PORTNAME}/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/
8	http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \	8	DISTNAME= ${PORTNAME:S/2//}-${DISTVERSION}
9	http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype2/ \
10	http://ftp.sunet.se/pub/text-processing/freetype/freetype2/ \
11	ftp://ftp.freetype.org/freetype/freetype2/
12	DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}
13		9
14	MAINTAINER= desktop@FreeBSD.org	10	MAINTAINER= desktop@FreeBSD.org
15	COMMENT= Free and portable TrueType font rendering engine	11	COMMENT= Free and portable TrueType font rendering engine
Lines 21-80 LICENSE_FILE_FTL= ${WRKSRC}/docs/FTL.TXT Link Here
21	LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/GPLv2.TXT	17	LICENSE_FILE_GPLv2+ = ${WRKSRC}/docs/GPLv2.TXT
22	LICENSE_PERMS_FTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept	18	LICENSE_PERMS_FTL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
23		19
24	USES= cpe gmake libtool tar:xz	20	USES= cmake cpe localbase pathfix pkgconfig tar:xz
25	MAKE_ENV= TOP=""	21
		22	CPE_PRODUCT= freetype
		23	CPE_VENDOR= freetype
26	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
27	GNU_CONFIGURE= yes	25
28	CONFIGURE_ARGS= --without-harfbuzz	26	CMAKE_ON= BUILD_SHARED_LIBS \
29	CONFIGURE_WRKSRC= ${WRKSRC}/builds/unix	27	FT_WITH_BZIP2 \
		28	CMAKE_DISABLE_FIND_PACKAGE_HarfBuzz \
		29	FT_WITH_ZLIB
		30
		31	CMAKE_OFF= FT_WITH_HARFBUZZ
30		32
31	SUB_FILES= pkg-message	33	SUB_FILES= pkg-message
32		34
33	PORTDOCS= reference CHANGES formats.txt LICENSE.TXT raster.txt	35	PORTDOCS= CHANGES FTL.TXT formats.txt raster.txt reference
34		36
35	CPE_PRODUCT= freetype	37	OPTIONS_DEFINE= BROTLI DEBUG DOCS LONG_PCF_NAMES PNG TABLE_VALIDATION
36	CPE_VENDOR= freetype	38	OPTIONS_DEFAULT= LCD_RENDERING LONG_PCF_NAMES PNG V40
		39	OPTIONS_SUB= yes
		40
		41	OPTIONS_SINGLE= RENDERING
		42	OPTIONS_SINGLE_RENDERING= LCD_FILTERING LCD_RENDERING
37		43
38	OPTIONS_DEFINE= BROTLI CONFIG DEBUG DOCS LONG_PCF_NAMES PNG \
39	TABLE_VALIDATION
40	OPTIONS_GROUP= SUBPIXEL_HINTING	44	OPTIONS_GROUP= SUBPIXEL_HINTING
41	OPTIONS_GROUP_SUBPIXEL_HINTING= V38 V40	45	OPTIONS_GROUP_SUBPIXEL_HINTING= V38 V40
42	OPTIONS_SINGLE= RENDERING	46
43	OPTIONS_SINGLE_RENDERING= LCD_FILTERING LCD_RENDERING
44	OPTIONS_RADIO= SIZE_METRICS_CHOICE	47	OPTIONS_RADIO= SIZE_METRICS_CHOICE
45	OPTIONS_RADIO_SIZE_METRICS_CHOICE= FIX_SIZE_METRICS TT_SIZE_METRICS	48	OPTIONS_RADIO_SIZE_METRICS_CHOICE= FIX_SIZE_METRICS TT_SIZE_METRICS
46	OPTIONS_DEFAULT= CONFIG LCD_RENDERING LONG_PCF_NAMES PNG V40
47	OPTIONS_SUB= yes
48
49	BROTLI_CONFIGURE_WITH= brotli
50	BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli
51	BROTLI_USES= pkgconfig
52	CONFIG_DESC= Install freetype-config
53	CONFIG_CONFIGURE_ENABLE=freetype-config
54	PNG_DESC= Png compressed OpenType embedded bitmaps support
55	PNG_LIB_DEPENDS= libpng.so:graphics/png
56	PNG_CONFIGURE_WITH= png
57		49
		50	LONG_PCF_NAMES_DESC= Enable long PCF family names
58	TABLE_VALIDATION_DESC= TrueType GX/AAT and OpenType table validation	51	TABLE_VALIDATION_DESC= TrueType GX/AAT and OpenType table validation
59		52	RENDERING_DESC= Rendering technology
		53	LCD_FILTERING_DESC= Subpixel rendering (patented)
		54	LCD_RENDERING_DESC= Harmony LCD rendering
		55	SUBPIXEL_HINTING_DESC= Subpixel hinting support
		56	V38_DESC= v38 mode (Infinality code)
		57	V40_DESC= v40 mode (minimal code, a.k.a. ClearType hinting, faster)
60	SIZE_METRICS_CHOICE_DESC= Size metrics for TrueType fonts	58	SIZE_METRICS_CHOICE_DESC= Size metrics for TrueType fonts
61	FIX_SIZE_METRICS_DESC= Fix metrics on size request for scalable fonts (alternative method)	59	FIX_SIZE_METRICS_DESC= Fix metrics on size request for scalable fonts (alternative method)
62	FIX_SIZE_METRICS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-fix_size_metrics.diff
63	TT_SIZE_METRICS_DESC= TrueType-like size metrics for 'light' auto-hinting	60	TT_SIZE_METRICS_DESC= TrueType-like size metrics for 'light' auto-hinting
64		61
65	RENDERING_DESC= Rendering technology	62	BROTLI_LIB_DEPENDS= libbrotlidec.so:archivers/brotli
66	LCD_FILTERING_DESC?= Subpixel rendering (patented)	63	BROTLI_CMAKE_BOOL= FT_WITH_BROTLI
67	LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING	64	BROTLI_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_BrotliDec
68	LCD_RENDERING_DESC= Harmony LCD rendering
69		65
70	LONG_PCF_NAMES_DESC= Enable long PCF family names	66	PNG_LIB_DEPENDS= libpng.so:graphics/png
		67	PNG_CMAKE_BOOL= FT_WITH_PNG
		68	PNG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG
		69
		70	LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
71		71
72	SUBPIXEL_HINTING_DESC= Subpixel hinting support
73	V38_DESC= v38 mode (Infinality code)
74	V38_VARS= SUBPIXEL_HINTING_MODE+=1	72	V38_VARS= SUBPIXEL_HINTING_MODE+=1
75	V40_DESC= v40 mode (minimal code, a.k.a. ClearType hinting, faster)
76	V40_VARS= SUBPIXEL_HINTING_MODE+=2	73	V40_VARS= SUBPIXEL_HINTING_MODE+=2
77		74
		75	FIX_SIZE_METRICS_EXTRA_PATCHES= ${FILESDIR}/extra-patch-fix_size_metrics.diff
		76
78	.include <bsd.port.pre.mk>	77	.include <bsd.port.pre.mk>
79		78
80	SELECTED_MODE= \	79	SELECTED_MODE= \
Lines 84-93 SELECTED_MODE= \ Link Here
84	done; \	83	done; \
85	${ECHO_CMD} $$r	84	${ECHO_CMD} $$r
86		85
87	pre-patch:
88	@${REINPLACE_CMD} -e 's\|[(]libdir[)]/pkgconfig\|(prefix)/libdata/pkgconfig\|g' \
89	${WRKSRC}/builds/unix/install.mk
90
91	post-patch:	86	post-patch:
92	.if defined(SUBPIXEL_HINTING_MODE)	87	.if defined(SUBPIXEL_HINTING_MODE)
93	@${REINPLACE_CMD} -i '.hinting.bak' \	88	@${REINPLACE_CMD} -i '.hinting.bak' \
Lines 120-132 post-patch-TT_SIZE_METRICS-on: Link Here
120	-e 's\|.\(#define AF_CONFIG_OPTION_TT_SIZE_METRICS\).\|\1\|' \	115	-e 's\|.\(#define AF_CONFIG_OPTION_TT_SIZE_METRICS\).\|\1\|' \
121	${WRKSRC}/include/freetype/config/ftoption.h	116	${WRKSRC}/include/freetype/config/ftoption.h
122		117
123	post-configure:
124	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
125	${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} setup)
126
127	post-install:
128	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfreetype.so.*
129
130	post-install-DOCS-on:	118	post-install-DOCS-on:
131	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})	119	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR})
132		120

Lines 1-26 Link Here

(-)b/print/freetype2/files/patch-builds_unix_detect.mk (-26 lines)
1	--- builds/unix/detect.mk.orig 2019-02-23 09:06:06 UTC
2	+++ builds/unix/detect.mk
3	@@ -22,6 +22,9 @@ ifeq ($(PLATFORM),ansi)
4	$(wildcard /usr/sbin/init) \
5	$(wildcard /dev/null) \
6	$(wildcard /hurd/auth))
7	+ # FreeBSD is "unix" so just mandate this to fix the build in
8	+ # jails that do not have init (see PR#113470).
9	+ is_unix := true
10	ifneq ($(is_unix),)
11
12	PLATFORM := unix
13	@@ -86,10 +89,10 @@ ifeq ($(PLATFORM),unix)
14	ifdef must_configure
15	ifneq ($(have_Makefile),)
16	# we are building FT2 not in the src tree
17	- $(TOP_DIR)/builds/unix/configure $(value CFG)
18	+# $(TOP_DIR)/builds/unix/configure $(value CFG)
19	else
20	- cd builds/unix; \
21	- ./configure $(value CFG)
22	+# cd builds/unix; \
23	+# ./configure $(value CFG)
24	endif
25	endif
26