Attachment #220147 for bug #251512

View | Details | Raw Unified | Return to bug 251512 | Differences between
Collapse All | Expand All





PORTNAME=	freetype2
DISTVERSION=	2.10.4
PORTREVISION=	1
CATEGORIES=	print
MASTER_SITES=	SAVANNAH/${PORTNAME:S/2//} \
		SF/freetype/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}/
		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype2/ \
		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

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

USES=		cmake cpe localbase pkgconfig tar:xz

CPE_PRODUCT=	freetype
CPE_VENDOR=	freetype
USE_LDCONFIG=	yes

CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON \
		-DFT_WITH_BZIP2:BOOL=ON \
		-DFT_WITH_HARFBUZZ:BOOL=OFF \
		-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz:BOOL=ON \
		-DFT_WITH_ZLIB:BOOL=ON

SUB_FILES=	pkg-message

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

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})





--- 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
 




%%CONFIG%%bin/freetype-config
include/freetype2/freetype/config/ftconfig.h
include/freetype2/freetype/config/ftheader.h
include/freetype2/freetype/config/ftmodule.h

include/freetype2/freetype/tttables.h
include/freetype2/freetype/tttags.h
include/freetype2/ft2build.h
lib/cmake/freetype/freetype-config-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/freetype/freetype-config-version.cmake
lib/cmake/freetype/freetype-config.cmake
lib/libfreetype.so
lib/libfreetype.so.6
lib/libfreetype.so.6.17.4
libdata/pkgconfig/freetype2.pc
%%CONFIG%%man/man1/freetype-config.1.gz
share/aclocal/freetype2.m4

Return to bug 251512

Lines 3-15 Link Here

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

Removed Link Here

(-)a/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

Lines 1-4 Link Here

(-)b/print/freetype2/pkg-plist (-4 / +3 lines)
1	%%CONFIG%%bin/freetype-config
2	include/freetype2/freetype/config/ftconfig.h	1	include/freetype2/freetype/config/ftconfig.h
3	include/freetype2/freetype/config/ftheader.h	2	include/freetype2/freetype/config/ftheader.h
4	include/freetype2/freetype/config/ftmodule.h	3	include/freetype2/freetype/config/ftmodule.h
Lines 52-61 include/freetype2/freetype/ttnameid.h Link Here
52	include/freetype2/freetype/tttables.h	51	include/freetype2/freetype/tttables.h
53	include/freetype2/freetype/tttags.h	52	include/freetype2/freetype/tttags.h
54	include/freetype2/ft2build.h	53	include/freetype2/ft2build.h
55	lib/libfreetype.a	54	lib/cmake/freetype/freetype-config-%%CMAKE_BUILD_TYPE%%.cmake
		55	lib/cmake/freetype/freetype-config-version.cmake
		56	lib/cmake/freetype/freetype-config.cmake
56	lib/libfreetype.so	57	lib/libfreetype.so
57	lib/libfreetype.so.6	58	lib/libfreetype.so.6
58	lib/libfreetype.so.6.17.4	59	lib/libfreetype.so.6.17.4
59	libdata/pkgconfig/freetype2.pc	60	libdata/pkgconfig/freetype2.pc
60	%%CONFIG%%man/man1/freetype-config.1.gz
61	share/aclocal/freetype2.m4