svn commit: r439575 - in head: editors/libreoffice print print/harfbuzz print/harfbuzz-icu print/tex-xetex print/texlive-base www/chromium www/webkit-gtk2 www/webkit-gtk3 www/webkit2-gtk3

Koop Mast kwm at FreeBSD.org
Thu Apr 27 21:31:12 UTC 2017


Author: kwm
Date: Thu Apr 27 21:31:09 2017
New Revision: 439575
URL: https://svnweb.freebsd.org/changeset/ports/439575

Log:
  Split off the harfbuzz icu support into it's own port.
  
  PR:		207779
  Submitted by:	Vladimir Kondratyev <vladimir at kondratyev.su>
  Exp-run by:	antoine@

Added:
  head/print/harfbuzz-icu/
  head/print/harfbuzz-icu/Makefile   (contents, props changed)
  head/print/harfbuzz-icu/pkg-plist   (contents, props changed)
Modified:
  head/editors/libreoffice/Makefile
  head/print/Makefile
  head/print/harfbuzz/Makefile
  head/print/harfbuzz/pkg-plist
  head/print/tex-xetex/Makefile
  head/print/texlive-base/Makefile
  head/www/chromium/Makefile
  head/www/webkit-gtk2/Makefile
  head/www/webkit-gtk3/Makefile
  head/www/webkit2-gtk3/Makefile

Modified: head/editors/libreoffice/Makefile
==============================================================================
--- head/editors/libreoffice/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/editors/libreoffice/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -2,7 +2,7 @@
 
 .include "${.CURDIR}/Makefile.common"
 
-PORTREVISION=	2
+PORTREVISION=	3
 MASTER_SITES=	http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
 		http://dev-www.libreoffice.org/src/:src \
 		http://dev-www.libreoffice.org/extern/:ext
@@ -50,6 +50,7 @@ LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		liblpsolve55.so:math/lp_solve \
 		libcmis-0.5.so:net/libcmis \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libmspub-0.1.so:print/libmspub01 \
 		libpagemaker-0.0.so:print/libpagemaker \
 		libnss3.so:security/nss \

Modified: head/print/Makefile
==============================================================================
--- head/print/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/print/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -88,6 +88,7 @@
     SUBDIR += gutenprint-ijs
     SUBDIR += gv
     SUBDIR += harfbuzz
+    SUBDIR += harfbuzz-icu
     SUBDIR += hp2xx
     SUBDIR += hpijs
     SUBDIR += hplip

Added: head/print/harfbuzz-icu/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/harfbuzz-icu/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-icu
+
+COMMENT=	Harfbuzz ICU support
+
+MASTERDIR=	${.CURDIR}/../../print/harfbuzz
+PLIST=		pkg-plist
+HARFBUZZ_SLAVE=	icu
+
+.include "${MASTERDIR}/Makefile"

Added: head/print/harfbuzz-icu/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/harfbuzz-icu/pkg-plist	Thu Apr 27 21:31:09 2017	(r439575)
@@ -0,0 +1,43 @@
+ at comment bin/hb-ot-shape-closure
+ at comment bin/hb-shape
+ at comment bin/hb-view
+ at comment include/harfbuzz/hb-blob.h
+ at comment include/harfbuzz/hb-buffer.h
+ at comment include/harfbuzz/hb-common.h
+ at comment include/harfbuzz/hb-deprecated.h
+ at comment include/harfbuzz/hb-face.h
+ at comment include/harfbuzz/hb-font.h
+ at comment include/harfbuzz/hb-ft.h
+ at comment include/harfbuzz/hb-glib.h
+ at comment include/harfbuzz/hb-gobject-enums.h
+ at comment include/harfbuzz/hb-gobject-structs.h
+ at comment include/harfbuzz/hb-gobject.h
+ at comment include/harfbuzz/hb-graphite2.h
+include/harfbuzz/hb-icu.h
+ at comment include/harfbuzz/hb-ot-font.h
+ at comment include/harfbuzz/hb-ot-layout.h
+ at comment include/harfbuzz/hb-ot-math.h
+ at comment include/harfbuzz/hb-ot-shape.h
+ at comment include/harfbuzz/hb-ot-tag.h
+ at comment include/harfbuzz/hb-ot-var.h
+ at comment include/harfbuzz/hb-ot.h
+ at comment include/harfbuzz/hb-set.h
+ at comment include/harfbuzz/hb-shape-plan.h
+ at comment include/harfbuzz/hb-shape.h
+ at comment include/harfbuzz/hb-unicode.h
+ at comment include/harfbuzz/hb-version.h
+ at comment include/harfbuzz/hb.h
+ at comment lib/girepository-1.0/HarfBuzz-0.0.typelib
+ at comment lib/libharfbuzz-gobject.so
+ at comment lib/libharfbuzz-gobject.so.0
+ at comment lib/libharfbuzz-gobject.so.%%LIBVER%%
+lib/libharfbuzz-icu.so
+lib/libharfbuzz-icu.so.0
+lib/libharfbuzz-icu.so.%%LIBVER%%
+ at comment lib/libharfbuzz.so
+ at comment lib/libharfbuzz.so.0
+ at comment lib/libharfbuzz.so.%%LIBVER%%
+ at comment libdata/pkgconfig/harfbuzz-gobject.pc
+libdata/pkgconfig/harfbuzz-icu.pc
+ at comment libdata/pkgconfig/harfbuzz.pc
+ at comment share/gir-1.0/HarfBuzz-0.0.gir

Modified: head/print/harfbuzz/Makefile
==============================================================================
--- head/print/harfbuzz/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/print/harfbuzz/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -3,18 +3,18 @@
 
 PORTNAME=	harfbuzz
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://www.freedesktop.org/software/harfbuzz/release/
 
 MAINTAINER=	gnome at FreeBSD.org
-COMMENT=	OpenType text shaping engine
+COMMENT?=	OpenType text shaping engine
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
-		libicudata.so:devel/icu \
 		libgraphite2.so:graphics/graphite2
 
 USE_LDCONFIG=	yes
-USES=		compiler:c++0x gettext-runtime gmake gnome libtool \
+USES=		gettext-runtime gmake gnome libtool \
 		pathfix pkgconfig tar:bzip2
 USE_GNOME=	cairo glib20 introspection:build
 GNU_CONFIGURE=	yes
@@ -24,4 +24,20 @@ TEST_TARGET=	check
 
 PLIST_SUB+=	LIBVER=0.10400.6
 
+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>

Modified: head/print/harfbuzz/pkg-plist
==============================================================================
--- head/print/harfbuzz/pkg-plist	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/print/harfbuzz/pkg-plist	Thu Apr 27 21:31:09 2017	(r439575)
@@ -13,7 +13,6 @@ include/harfbuzz/hb-gobject-enums.h
 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
@@ -31,14 +30,10 @@ lib/girepository-1.0/HarfBuzz-0.0.typeli
 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

Modified: head/print/tex-xetex/Makefile
==============================================================================
--- head/print/tex-xetex/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/print/tex-xetex/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xetex
 PORTVERSION=	0.99992
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	print
 MASTER_SITES=	ftp://tug.org/historic/systems/texlive/2015/
 PKGNAMEPREFIX=	tex-
@@ -19,6 +19,7 @@ LIB_DEPENDS=	libfreetype.so:print/freety
 		libgraphite2.so:graphics/graphite2 \
 		libicuio.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libpoppler.so:graphics/poppler \
 		libTECkit.so:textproc/teckit

Modified: head/print/texlive-base/Makefile
==============================================================================
--- head/print/texlive-base/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/print/texlive-base/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -2,7 +2,7 @@
 
 PORTNAME=	texlive
 PORTVERSION=	20150521
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	print
 MASTER_SITES=	TEX_CTAN/systems/texlive/Source/
 PKGNAMESUFFIX=	-base
@@ -20,6 +20,7 @@ LIB_DEPENDS=	libicuio.so:devel/icu \
 		libgraphite2.so:graphics/graphite2 \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng.so:graphics/png \
 		libzzip.so:devel/zziplib \
 		libpoppler.so:graphics/poppler \

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/www/chromium/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -3,7 +3,7 @@
 
 PORTNAME=	chromium
 PORTVERSION=	57.0.2987.133
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -47,6 +47,7 @@ LIB_DEPENDS=	libspeechd.so:accessibility
 		libcups.so:print/cups \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libgcrypt.so:security/libgcrypt \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libnss3.so:security/nss \

Modified: head/www/webkit-gtk2/Makefile
==============================================================================
--- head/www/webkit-gtk2/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/www/webkit-gtk2/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -3,7 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.4.11
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk2
@@ -20,6 +20,7 @@ LIB_DEPENDS=	libenchant.so:textproc/ench
 		libsecret-1.so:security/libsecret \
 		libicutu.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libpng16.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libcurl.so:ftp/curl \

Modified: head/www/webkit-gtk3/Makefile
==============================================================================
--- head/www/webkit-gtk3/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/www/webkit-gtk3/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -3,7 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.4.11
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	-gtk3
@@ -20,6 +20,7 @@ LIB_DEPENDS=	libenchant.so:textproc/ench
 		libsecret-1.so:security/libsecret \
 		libicutu.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libwebp.so:graphics/webp \
 		libcurl.so:ftp/curl \
 		libsoup-2.4.so:devel/libsoup

Modified: head/www/webkit2-gtk3/Makefile
==============================================================================
--- head/www/webkit2-gtk3/Makefile	Thu Apr 27 21:29:52 2017	(r439574)
+++ head/www/webkit2-gtk3/Makefile	Thu Apr 27 21:31:09 2017	(r439575)
@@ -3,7 +3,7 @@
 
 PORTNAME=	webkit
 PORTVERSION=	2.8.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	www
 MASTER_SITES=	http://webkitgtk.org/releases/
 PKGNAMESUFFIX=	2-gtk3
@@ -22,6 +22,7 @@ LIB_DEPENDS=	libenchant.so:textproc/ench
 		libsecret-1.so:security/libsecret \
 		libicutu.so:devel/icu \
 		libharfbuzz.so:print/harfbuzz \
+		libharfbuzz-icu.so:print/harfbuzz-icu \
 		libsoup-2.4.so:devel/libsoup
 RUN_DEPENDS=	geoclue>=0:net/geoclue
 


More information about the svn-ports-head mailing list