Attachment #181982 for bug #207779

Lines 2-8 Link Here

(-)editors/libreoffice/Makefile (-1 / +2 lines)
2		2
3	.include "${.CURDIR}/Makefile.common"	3	.include "${.CURDIR}/Makefile.common"
4		4
5	PORTREVISION= 2	5	PORTREVISION= 3
6	MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \	6	MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
7	http://dev-www.libreoffice.org/src/:src \	7	http://dev-www.libreoffice.org/src/:src \
8	http://dev-www.libreoffice.org/extern/:ext	8	http://dev-www.libreoffice.org/extern/:ext
Lines 50-55 Link Here
50	liblpsolve55.so:math/lp_solve \	50	liblpsolve55.so:math/lp_solve \
51	libcmis-0.5.so:net/libcmis \	51	libcmis-0.5.so:net/libcmis \
52	libharfbuzz.so:print/harfbuzz \	52	libharfbuzz.so:print/harfbuzz \
		53	libharfbuzz-icu.so:print/harfbuzz-icu \
53	libmspub-0.1.so:print/libmspub01 \	54	libmspub-0.1.so:print/libmspub01 \
54	libpagemaker-0.0.so:print/libpagemaker \	55	libpagemaker-0.0.so:print/libpagemaker \
55	libnss3.so:security/nss \	56	libnss3.so:security/nss \

Lines 88-93 Link Here

(-)print/Makefile (+1 lines)
88	SUBDIR += gutenprint-ijs	88	SUBDIR += gutenprint-ijs
89	SUBDIR += gv	89	SUBDIR += gv
90	SUBDIR += harfbuzz	90	SUBDIR += harfbuzz
		91	SUBDIR += harfbuzz-icu
91	SUBDIR += hp2xx	92	SUBDIR += hp2xx
92	SUBDIR += hpijs	93	SUBDIR += hpijs
93	SUBDIR += hplip	94	SUBDIR += hplip





PORTNAME=	harfbuzz
PORTVERSION=	1.4.5
PORTREVISION=	2
CATEGORIES=	print
MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/

MAINTAINER=	gnome@FreeBSD.org
COMMENT?=	OpenType text shaping engine

LIB_DEPENDS=	libfreetype.so:print/freetype2 \
		libicudata.so:devel/icu \
		libgraphite2.so:graphics/graphite2

USE_LDCONFIG=	yes
USES=		gettext-runtime gmake gnome libtool \
		pathfix pkgconfig tar:bzip2
USE_GNOME=	cairo glib20 introspection:build
GNU_CONFIGURE=	yes


PLIST_SUB+=	LIBVER=0.10400.5

HARFBUZZ_SLAVE?=	no

.if ${HARFBUZZ_SLAVE} == no
CONFIGURE_ARGS+=	--without-icu
.else
CONFIGURE_ARGS+=	--with-icu \
		--disable-gtk-doc-html
USES+=		compiler:c++0x
LIB_DEPENDS+=	libharfbuzz.so:print/harfbuzz \
		libicudata.so:devel/icu

post-patch:
	${REINPLACE_CMD} -e 's|install-data-am: install-data-local|install-data-am:|g' \
		${WRKSRC}/docs/Makefile.in
.endif

.include <bsd.port.mk>




include/harfbuzz/hb-gobject-structs.h
include/harfbuzz/hb-gobject.h
include/harfbuzz/hb-graphite2.h
include/harfbuzz/hb-icu.h
include/harfbuzz/hb-ot-font.h
include/harfbuzz/hb-ot-layout.h
include/harfbuzz/hb-ot-math.h

lib/libharfbuzz-gobject.so
lib/libharfbuzz-gobject.so.0
lib/libharfbuzz-gobject.so.%%LIBVER%%
lib/libharfbuzz-icu.so
lib/libharfbuzz-icu.so.0
lib/libharfbuzz-icu.so.%%LIBVER%%
lib/libharfbuzz.so
lib/libharfbuzz.so.0
lib/libharfbuzz.so.%%LIBVER%%
libdata/pkgconfig/harfbuzz-gobject.pc
libdata/pkgconfig/harfbuzz-icu.pc
libdata/pkgconfig/harfbuzz.pc
share/gir-1.0/HarfBuzz-0.0.gir
share/gtk-doc/html/harfbuzz/HarfBuzz.png

Line 0 Link Here

(-)print/harfbuzz-icu/Makefile (+11 lines)
	1	# $FreeBSD$
	2
	3	PKGNAMESUFFIX= -icu
	4
	5	COMMENT= Harfbuzz ICU support
	6
	7	MASTERDIR= ${.CURDIR}/../../print/harfbuzz
	8	PLIST= pkg-plist
	9	HARFBUZZ_SLAVE= icu
	10
	11	.include "${MASTERDIR}/Makefile"




@comment bin/hb-ot-shape-closure
@comment bin/hb-shape
@comment bin/hb-view
@comment include/harfbuzz/hb-blob.h
@comment include/harfbuzz/hb-buffer.h
@comment include/harfbuzz/hb-common.h
@comment include/harfbuzz/hb-deprecated.h
@comment include/harfbuzz/hb-face.h
@comment include/harfbuzz/hb-font.h
@comment include/harfbuzz/hb-ft.h
@comment include/harfbuzz/hb-glib.h
@comment include/harfbuzz/hb-gobject-enums.h
@comment include/harfbuzz/hb-gobject-structs.h
@comment include/harfbuzz/hb-gobject.h
@comment include/harfbuzz/hb-graphite2.h
include/harfbuzz/hb-icu.h
@comment include/harfbuzz/hb-ot-font.h
@comment include/harfbuzz/hb-ot-layout.h
@comment include/harfbuzz/hb-ot-math.h
@comment include/harfbuzz/hb-ot-shape.h
@comment include/harfbuzz/hb-ot-tag.h
@comment include/harfbuzz/hb-ot-var.h
@comment include/harfbuzz/hb-ot.h
@comment include/harfbuzz/hb-set.h
@comment include/harfbuzz/hb-shape-plan.h
@comment include/harfbuzz/hb-shape.h
@comment include/harfbuzz/hb-unicode.h
@comment include/harfbuzz/hb-version.h
@comment include/harfbuzz/hb.h
@comment lib/girepository-1.0/HarfBuzz-0.0.typelib
@comment lib/libharfbuzz-gobject.so
@comment lib/libharfbuzz-gobject.so.0
@comment lib/libharfbuzz-gobject.so.%%LIBVER%%
lib/libharfbuzz-icu.so
lib/libharfbuzz-icu.so.0
lib/libharfbuzz-icu.so.%%LIBVER%%
@comment lib/libharfbuzz.so
@comment lib/libharfbuzz.so.0
@comment lib/libharfbuzz.so.%%LIBVER%%
@comment libdata/pkgconfig/harfbuzz-gobject.pc
libdata/pkgconfig/harfbuzz-icu.pc
@comment libdata/pkgconfig/harfbuzz.pc
@comment share/gir-1.0/HarfBuzz-0.0.gir

Lines 2-8 Link Here

(-)print/tex-xetex/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= xetex	3	PORTNAME= xetex
4	PORTVERSION= 0.99992	4	PORTVERSION= 0.99992
5	PORTREVISION= 9	5	PORTREVISION= 10
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/	7	MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
8	PKGNAMEPREFIX= tex-	8	PKGNAMEPREFIX= tex-
Lines 19-24 Link Here
19	libgraphite2.so:graphics/graphite2 \	19	libgraphite2.so:graphics/graphite2 \
20	libicuio.so:devel/icu \	20	libicuio.so:devel/icu \
21	libharfbuzz.so:print/harfbuzz \	21	libharfbuzz.so:print/harfbuzz \
		22	libharfbuzz-icu.so:print/harfbuzz-icu \
22	libpng.so:graphics/png \	23	libpng.so:graphics/png \
23	libpoppler.so:graphics/poppler \	24	libpoppler.so:graphics/poppler \
24	libTECkit.so:textproc/teckit	25	libTECkit.so:textproc/teckit

Lines 2-8 Link Here

(-)print/texlive-base/Makefile (-1 / +2 lines)
2		2
3	PORTNAME= texlive	3	PORTNAME= texlive
4	PORTVERSION= 20150521	4	PORTVERSION= 20150521
5	PORTREVISION= 15	5	PORTREVISION= 16
6	CATEGORIES= print	6	CATEGORIES= print
7	MASTER_SITES= TEX_CTAN/systems/texlive/Source/	7	MASTER_SITES= TEX_CTAN/systems/texlive/Source/
8	PKGNAMESUFFIX= -base	8	PKGNAMESUFFIX= -base
Lines 20-25 Link Here
20	libgraphite2.so:graphics/graphite2 \	20	libgraphite2.so:graphics/graphite2 \
21	libfreetype.so:print/freetype2 \	21	libfreetype.so:print/freetype2 \
22	libharfbuzz.so:print/harfbuzz \	22	libharfbuzz.so:print/harfbuzz \
		23	libharfbuzz-icu.so:print/harfbuzz-icu \
23	libpng.so:graphics/png \	24	libpng.so:graphics/png \
24	libzzip.so:devel/zziplib \	25	libzzip.so:devel/zziplib \
25	libpoppler.so:graphics/poppler \	26	libpoppler.so:graphics/poppler \

Lines 3-8 Link Here

(-)www/chromium/Makefile (+2 lines)
3		3
4	PORTNAME= chromium	4	PORTNAME= chromium
5	PORTVERSION= 57.0.2987.133	5	PORTVERSION= 57.0.2987.133
		6	PORTREVISION= 1
6	CATEGORIES= www	7	CATEGORIES= www
7	MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/	8	MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/
8	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on	9	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
Lines 46-51 Link Here
46	libcups.so:print/cups \	47	libcups.so:print/cups \
47	libfreetype.so:print/freetype2 \	48	libfreetype.so:print/freetype2 \
48	libharfbuzz.so:print/harfbuzz \	49	libharfbuzz.so:print/harfbuzz \
		50	libharfbuzz-icu.so:print/harfbuzz-icu \
49	libgcrypt.so:security/libgcrypt \	51	libgcrypt.so:security/libgcrypt \
50	libgnome-keyring.so:security/libgnome-keyring \	52	libgnome-keyring.so:security/libgnome-keyring \
51	libnss3.so:security/nss \	53	libnss3.so:security/nss \

Lines 3-9 Link Here

(-)www/webkit-gtk2/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.4.11	5	PORTVERSION= 2.4.11
6	PORTREVISION= 7	6	PORTREVISION= 8
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://webkitgtk.org/releases/	8	MASTER_SITES= http://webkitgtk.org/releases/
9	PKGNAMESUFFIX= -gtk2	9	PKGNAMESUFFIX= -gtk2
Lines 20-25 Link Here
20	libsecret-1.so:security/libsecret \	20	libsecret-1.so:security/libsecret \
21	libicutu.so:devel/icu \	21	libicutu.so:devel/icu \
22	libharfbuzz.so:print/harfbuzz \	22	libharfbuzz.so:print/harfbuzz \
		23	libharfbuzz-icu.so:print/harfbuzz-icu \
23	libpng16.so:graphics/png \	24	libpng16.so:graphics/png \
24	libwebp.so:graphics/webp \	25	libwebp.so:graphics/webp \
25	libcurl.so:ftp/curl \	26	libcurl.so:ftp/curl \

Lines 3-9 Link Here

(-)www/webkit-gtk3/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.4.11	5	PORTVERSION= 2.4.11
6	PORTREVISION= 6	6	PORTREVISION= 7
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://webkitgtk.org/releases/	8	MASTER_SITES= http://webkitgtk.org/releases/
9	PKGNAMESUFFIX= -gtk3	9	PKGNAMESUFFIX= -gtk3
Lines 20-25 Link Here
20	libsecret-1.so:security/libsecret \	20	libsecret-1.so:security/libsecret \
21	libicutu.so:devel/icu \	21	libicutu.so:devel/icu \
22	libharfbuzz.so:print/harfbuzz \	22	libharfbuzz.so:print/harfbuzz \
		23	libharfbuzz-icu.so:print/harfbuzz-icu \
23	libwebp.so:graphics/webp \	24	libwebp.so:graphics/webp \
24	libcurl.so:ftp/curl \	25	libcurl.so:ftp/curl \
25	libsoup-2.4.so:devel/libsoup	26	libsoup-2.4.so:devel/libsoup

Lines 3-9 Link Here

(-)www/webkit2-gtk3/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= webkit	4	PORTNAME= webkit
5	PORTVERSION= 2.8.5	5	PORTVERSION= 2.8.5
6	PORTREVISION= 8	6	PORTREVISION= 9
7	CATEGORIES= www	7	CATEGORIES= www
8	MASTER_SITES= http://webkitgtk.org/releases/	8	MASTER_SITES= http://webkitgtk.org/releases/
9	PKGNAMESUFFIX= 2-gtk3	9	PKGNAMESUFFIX= 2-gtk3
Lines 22-27 Link Here
22	libsecret-1.so:security/libsecret \	22	libsecret-1.so:security/libsecret \
23	libicutu.so:devel/icu \	23	libicutu.so:devel/icu \
24	libharfbuzz.so:print/harfbuzz \	24	libharfbuzz.so:print/harfbuzz \
		25	libharfbuzz-icu.so:print/harfbuzz-icu \
25	libsoup-2.4.so:devel/libsoup	26	libsoup-2.4.so:devel/libsoup
26	RUN_DEPENDS= geoclue>=0:net/geoclue	27	RUN_DEPENDS= geoclue>=0:net/geoclue
27		28

Return to bug 207779

Lines 3-21 Link Here

(-)print/harfbuzz/Makefile (-4 / +19 lines)
3		3
4	PORTNAME= harfbuzz	4	PORTNAME= harfbuzz
5	PORTVERSION= 1.4.5	5	PORTVERSION= 1.4.5
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= print	7	CATEGORIES= print
8	MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/	8	MASTER_SITES= http://www.freedesktop.org/software/harfbuzz/release/
9		9
10	MAINTAINER= gnome@FreeBSD.org	10	MAINTAINER= gnome@FreeBSD.org
11	COMMENT= OpenType text shaping engine	11	COMMENT?= OpenType text shaping engine
12		12
13	LIB_DEPENDS= libfreetype.so:print/freetype2 \	13	LIB_DEPENDS= libfreetype.so:print/freetype2 \
14	libicudata.so:devel/icu \
15	libgraphite2.so:graphics/graphite2	14	libgraphite2.so:graphics/graphite2
16		15
17	USE_LDCONFIG= yes	16	USE_LDCONFIG= yes
18	USES= compiler:c++0x gettext-runtime gmake gnome libtool \	17	USES= gettext-runtime gmake gnome libtool \
19	pathfix pkgconfig tar:bzip2	18	pathfix pkgconfig tar:bzip2
20	USE_GNOME= cairo glib20 introspection:build	19	USE_GNOME= cairo glib20 introspection:build
21	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
Lines 25-28 Link Here
25		24
26	PLIST_SUB+= LIBVER=0.10400.5	25	PLIST_SUB+= LIBVER=0.10400.5
27		26
		27	HARFBUZZ_SLAVE?= no
		28
		29	.if ${HARFBUZZ_SLAVE} == no
		30	CONFIGURE_ARGS+= --without-icu
		31	.else
		32	CONFIGURE_ARGS+= --with-icu \
		33	--disable-gtk-doc-html
		34	USES+= compiler:c++0x
		35	LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz \
		36	libicudata.so:devel/icu
		37
		38	post-patch:
		39	${REINPLACE_CMD} -e 's\|install-data-am: install-data-local\|install-data-am:\|g' \
		40	${WRKSRC}/docs/Makefile.in
		41	.endif
		42
28	.include <bsd.port.mk>	43	.include <bsd.port.mk>

Lines 13-19 Link Here

(-)print/harfbuzz/pkg-plist (-5 lines)
13	include/harfbuzz/hb-gobject-structs.h	13	include/harfbuzz/hb-gobject-structs.h
14	include/harfbuzz/hb-gobject.h	14	include/harfbuzz/hb-gobject.h
15	include/harfbuzz/hb-graphite2.h	15	include/harfbuzz/hb-graphite2.h
16	include/harfbuzz/hb-icu.h
17	include/harfbuzz/hb-ot-font.h	16	include/harfbuzz/hb-ot-font.h
18	include/harfbuzz/hb-ot-layout.h	17	include/harfbuzz/hb-ot-layout.h
19	include/harfbuzz/hb-ot-math.h	18	include/harfbuzz/hb-ot-math.h
Lines 31-44 Link Here
31	lib/libharfbuzz-gobject.so	30	lib/libharfbuzz-gobject.so
32	lib/libharfbuzz-gobject.so.0	31	lib/libharfbuzz-gobject.so.0
33	lib/libharfbuzz-gobject.so.%%LIBVER%%	32	lib/libharfbuzz-gobject.so.%%LIBVER%%
34	lib/libharfbuzz-icu.so
35	lib/libharfbuzz-icu.so.0
36	lib/libharfbuzz-icu.so.%%LIBVER%%
37	lib/libharfbuzz.so	33	lib/libharfbuzz.so
38	lib/libharfbuzz.so.0	34	lib/libharfbuzz.so.0
39	lib/libharfbuzz.so.%%LIBVER%%	35	lib/libharfbuzz.so.%%LIBVER%%
40	libdata/pkgconfig/harfbuzz-gobject.pc	36	libdata/pkgconfig/harfbuzz-gobject.pc
41	libdata/pkgconfig/harfbuzz-icu.pc
42	libdata/pkgconfig/harfbuzz.pc	37	libdata/pkgconfig/harfbuzz.pc
43	share/gir-1.0/HarfBuzz-0.0.gir	38	share/gir-1.0/HarfBuzz-0.0.gir
44	share/gtk-doc/html/harfbuzz/HarfBuzz.png	39	share/gtk-doc/html/harfbuzz/HarfBuzz.png

Line 0 Link Here

(-)print/harfbuzz-icu/pkg-plist (+43 lines)
	1	@comment bin/hb-ot-shape-closure
	2	@comment bin/hb-shape
	3	@comment bin/hb-view
	4	@comment include/harfbuzz/hb-blob.h
	5	@comment include/harfbuzz/hb-buffer.h
	6	@comment include/harfbuzz/hb-common.h
	7	@comment include/harfbuzz/hb-deprecated.h
	8	@comment include/harfbuzz/hb-face.h
	9	@comment include/harfbuzz/hb-font.h
	10	@comment include/harfbuzz/hb-ft.h
	11	@comment include/harfbuzz/hb-glib.h
	12	@comment include/harfbuzz/hb-gobject-enums.h
	13	@comment include/harfbuzz/hb-gobject-structs.h
	14	@comment include/harfbuzz/hb-gobject.h
	15	@comment include/harfbuzz/hb-graphite2.h
	16	include/harfbuzz/hb-icu.h
	17	@comment include/harfbuzz/hb-ot-font.h
	18	@comment include/harfbuzz/hb-ot-layout.h
	19	@comment include/harfbuzz/hb-ot-math.h
	20	@comment include/harfbuzz/hb-ot-shape.h
	21	@comment include/harfbuzz/hb-ot-tag.h
	22	@comment include/harfbuzz/hb-ot-var.h
	23	@comment include/harfbuzz/hb-ot.h
	24	@comment include/harfbuzz/hb-set.h
	25	@comment include/harfbuzz/hb-shape-plan.h
	26	@comment include/harfbuzz/hb-shape.h
	27	@comment include/harfbuzz/hb-unicode.h
	28	@comment include/harfbuzz/hb-version.h
	29	@comment include/harfbuzz/hb.h
	30	@comment lib/girepository-1.0/HarfBuzz-0.0.typelib
	31	@comment lib/libharfbuzz-gobject.so
	32	@comment lib/libharfbuzz-gobject.so.0
	33	@comment lib/libharfbuzz-gobject.so.%%LIBVER%%
	34	lib/libharfbuzz-icu.so
	35	lib/libharfbuzz-icu.so.0
	36	lib/libharfbuzz-icu.so.%%LIBVER%%
	37	@comment lib/libharfbuzz.so
	38	@comment lib/libharfbuzz.so.0
	39	@comment lib/libharfbuzz.so.%%LIBVER%%
	40	@comment libdata/pkgconfig/harfbuzz-gobject.pc
	41	libdata/pkgconfig/harfbuzz-icu.pc
	42	@comment libdata/pkgconfig/harfbuzz.pc
	43	@comment share/gir-1.0/HarfBuzz-0.0.gir