summaryrefslogtreecommitdiff
path: root/x11-fonts/fontconfig
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2013-07-31 11:57:45 +0000
committerKoop Mast <kwm@FreeBSD.org>2013-07-31 11:57:45 +0000
commita5f590e51d3b147b9b5085ac6a2920189b42967a (patch)
treecee27e48f57eafc0ae5948472d8e095072bb5222 /x11-fonts/fontconfig
parent- Convert to new perl framework (diff)
The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.
This update updates Glib20 to 2.36 and Gtk+ 3.8 * The gio-fam-backend port that used gamin for the GFileMonitor API is gone. It is replaced by a GIO kqueue implementation developed as part of a NetBSD GSoC 2011 project by Dimitry Matveev. * Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0 pkgconfig file [1]. This broke static linking and newer binutils. * Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to prevent creation of / root/.cache dir. Defaults to build & run depend, but :build and :run switches available. * New x11-toolkits/pangox-compat port and companion USE_GNOME component for pangox support which was removed from the pango port. Add it to ports still using pangox API. Exp-run by: bapt@ PR: ports/178958 [1] Submitted by: emaste@ [1]
Notes
Notes: svn path=/head/; revision=324037
Diffstat (limited to 'x11-fonts/fontconfig')
-rw-r--r--x11-fonts/fontconfig/Makefile22
-rw-r--r--x11-fonts/fontconfig/distinfo4
-rw-r--r--x11-fonts/fontconfig/files/fc-query.14
-rw-r--r--x11-fonts/fontconfig/files/fc-scan.12
-rw-r--r--x11-fonts/fontconfig/files/patch-Makefile.in44
-rw-r--r--x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h26
-rw-r--r--x11-fonts/fontconfig/pkg-descr2
-rw-r--r--x11-fonts/fontconfig/pkg-plist5
8 files changed, 33 insertions, 76 deletions
diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 1efe9d05b038..a1d6867edd0e 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -1,9 +1,9 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/x11-fonts/fontconfig/Makefile,v 1.29 2011/04/30 20:43:31 mezz Exp $
+# $MCom: ports/trunk/x11-fonts/fontconfig/Makefile 18637 2013-07-27 09:15:21Z kwm $
PORTNAME= fontconfig
-PORTVERSION= 2.9.0
+PORTVERSION= 2.10.93
PORTREVISION?= 0
PORTEPOCH?= 1
CATEGORIES= x11-fonts
@@ -12,34 +12,38 @@ MASTER_SITES= http://www.freedesktop.org/software/fontconfig/release/
MAINTAINER= gnome@FreeBSD.org
COMMENT= An XML-based font configuration API for X Windows
+USE_BZIP2= yes
+
.if !defined(REFERENCE_PORT)
LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
expat:${PORTSDIR}/textproc/expat2
-USE_GMAKE= yes
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack ltverhack
-CONFIGURE_ARGS= --with-confdir=${PREFIX}/etc/fonts \
+USES= gmake pathfix pkgconfig
+USE_GNOME= ltverhack
+CONFIGURE_ARGS= --with-configdir=${PREFIX}/etc/fonts/conf.d \
+ --with-templatedir=${PREFIX}/etc/fonts/conf.avail \
+ --with-xmldir=${PREFIX}/etc/fonts \
--with-expat-includes=${LOCALBASE}/include \
--with-expat-lib=${LOCALBASE}/lib \
--with-default-fonts=${PREFIX}/share/fonts \
--with-add-fonts=${LOCALBASE}/lib/X11/fonts \
--with-cache-dir=/var/db/fontconfig \
+ --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig \
--disable-docs
MAKE_ENV= LC_ALL=C
-MAKE_JOBS_SAFE= yes
PKGINSTALL= ${WRKDIR}/pkg-install
MAN1= fc-cache.1 fc-cat.1 fc-list.1 fc-match.1 fc-query.1 fc-scan.1
MAN5= fonts-conf.5
PORTDOCS= fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
.endif
@@ -61,6 +65,6 @@ post-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
.endif
diff --git a/x11-fonts/fontconfig/distinfo b/x11-fonts/fontconfig/distinfo
index 18f7db090d38..fd942cc89131 100644
--- a/x11-fonts/fontconfig/distinfo
+++ b/x11-fonts/fontconfig/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fontconfig-2.9.0.tar.gz) = ca7e25071cf044bdcdaf7c48845243c115b9269b4e369c6bd78a29e71f01b41a
-SIZE (fontconfig-2.9.0.tar.gz) = 1682774
+SHA256 (fontconfig-2.10.93.tar.bz2) = ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c
+SIZE (fontconfig-2.10.93.tar.bz2) = 1526089
diff --git a/x11-fonts/fontconfig/files/fc-query.1 b/x11-fonts/fontconfig/files/fc-query.1
index 38dbaa43bef8..e36622a5b496 100644
--- a/x11-fonts/fontconfig/files/fc-query.1
+++ b/x11-fonts/fontconfig/files/fc-query.1
@@ -1,4 +1,4 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
+.\\" auto-generated by docbook2man-spec $Revision: 1.5 $
.TH "FC-QUERY" "1" "Aug 13, 2008" "" ""
.SH NAME
fc-query \- query font files
@@ -39,7 +39,7 @@ Query \fIfont-file\fR for font faces.
.SH "RETURN CODES"
.PP
\fBfc-query\fR returns error code 0 for successful parsing,
-or 1 if any errors occurred or if at least one font face could not be opened.
+or 1 if any errors occured or if at least one font face could not be opened.
.SH "SEE ALSO"
.PP
\fBfc-scan\fR(1)
diff --git a/x11-fonts/fontconfig/files/fc-scan.1 b/x11-fonts/fontconfig/files/fc-scan.1
index 77748d18f5c4..c2bd1ed54301 100644
--- a/x11-fonts/fontconfig/files/fc-scan.1
+++ b/x11-fonts/fontconfig/files/fc-scan.1
@@ -1,4 +1,4 @@
-.\\" auto-generated by docbook2man-spec $Revision: 1.1 $
+.\\" auto-generated by docbook2man-spec $Revision: 1.5 $
.TH "FC-SCAN" "1" "Jan 15, 2009" "" ""
.SH NAME
fc-scan \- scan font files or directories
diff --git a/x11-fonts/fontconfig/files/patch-Makefile.in b/x11-fonts/fontconfig/files/patch-Makefile.in
index 545b0ddb667d..8c8b6784ea31 100644
--- a/x11-fonts/fontconfig/files/patch-Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-Makefile.in
@@ -1,20 +1,20 @@
---- Makefile.in.orig 2012-05-20 12:18:32.000000000 -0500
-+++ Makefile.in 2012-05-20 12:19:20.000000000 -0500
-@@ -900,28 +900,28 @@
+--- Makefile.in.orig 2012-11-01 10:55:40.000000000 +0000
++++ Makefile.in 2012-11-01 10:56:37.000000000 +0000
+@@ -932,28 +932,6 @@
mv $@.tmp $@
install-data-local: fonts.conf
-- $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
-- if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
-- echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
-- mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
+- $(mkinstalldirs) $(DESTDIR)$(baseconfigdir) $(DESTDIR)$(fc_cachedir)
+- if [ -f $(DESTDIR)$(baseconfigdir)/fonts.conf ]; then \
+- echo "backing up existing $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+- mv $(DESTDIR)$(baseconfigdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf.bak; \
- fi
- if [ -f $(srcdir)/fonts.conf ]; then \
-- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+- echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+- $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
- else if [ -f fonts.conf ]; then \
-- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
+- echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf"; \
+- $(INSTALL_DATA) fonts.conf $(DESTDIR)$(baseconfigdir)/fonts.conf; \
- fi; fi
- @(if $(RUN_FC_CACHE_TEST); then \
- echo "fc-cache$(EXEEXT) -s -f -v"; \
@@ -26,28 +26,6 @@
- echo "*** Generate this file manually on host system using fc-cache"; \
- echo "***"; \
- fi)
-+# $(mkinstalldirs) $(DESTDIR)$(configdir) $(DESTDIR)$(fc_cachedir)
-+# if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
-+# echo "backing up existing $(DESTDIR)$(configdir)/fonts.conf"; \
-+# mv $(DESTDIR)$(configdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf.bak; \
-+# fi
-+# if [ -f $(srcdir)/fonts.conf ]; then \
-+# echo " $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-+# $(INSTALL_DATA) $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
-+# else if [ -f fonts.conf ]; then \
-+# echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
-+# $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
-+# fi; fi
-+# @(if $(RUN_FC_CACHE_TEST); then \
-+# echo "fc-cache$(EXEEXT) -s -f -v"; \
-+# fc-cache/fc-cache$(EXEEXT) -s -f -v; \
-+# else \
-+# echo "***"; \
-+# echo "*** Warning: fonts.cache not built"; \
-+# echo "***"; \
-+# echo "*** Generate this file manually on host system using fc-cache"; \
-+# echo "***"; \
-+# fi)
uninstall-local:
if [ -f $(srcdir)/fonts.conf ]; then \
diff --git a/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h b/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h
deleted file mode 100644
index 3434d003b24f..000000000000
--- a/x11-fonts/fontconfig/files/patch-fontconfig_fontconfig.h
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7069d717e982adcf8e1d300cbd10eec6322a65c9 Mon Sep 17 00:00:00 2001
-From: Akira TAGOH <akira@tagoh.org>
-Date: Sun, 22 Apr 2012 12:40:44 +0000
-Subject: C++11 requires a space between literal and identifier
-
-Reported by Buganini
----
-diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
-index 0e2ca50..b27ccb5 100644
---- fontconfig/fontconfig.h
-+++ fontconfig/fontconfig.h
-@@ -112,9 +112,9 @@ typedef int FcBool;
- #define FC_DECORATIVE "decorative" /* Bool - true if style is a decorative variant */
- #define FC_LCD_FILTER "lcdfilter" /* Int */
-
--#define FC_CACHE_SUFFIX ".cache-"FC_CACHE_VERSION
--#define FC_DIR_CACHE_FILE "fonts.cache-"FC_CACHE_VERSION
--#define FC_USER_CACHE_FILE ".fonts.cache-"FC_CACHE_VERSION
-+#define FC_CACHE_SUFFIX ".cache-" FC_CACHE_VERSION
-+#define FC_DIR_CACHE_FILE "fonts.cache-" FC_CACHE_VERSION
-+#define FC_USER_CACHE_FILE ".fonts.cache-" FC_CACHE_VERSION
-
- /* Adjust outline rasterizer */
- #define FC_CHAR_WIDTH "charwidth" /* Int */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-fonts/fontconfig/pkg-descr b/x11-fonts/fontconfig/pkg-descr
index d41e3fdd83a8..33793ec4c289 100644
--- a/x11-fonts/fontconfig/pkg-descr
+++ b/x11-fonts/fontconfig/pkg-descr
@@ -13,4 +13,4 @@ Fontconfig does the following:
* be used in concert with the X Render Extension and FreeType to implement
high quality, anti-aliased and subpixel rendered text on a display.
-WWW: http://fontconfig.org/
+WWW: http://www.freedesktop.org/wiki/Software/fontconfig
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 215d7e299fb2..91ad7018da80 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -5,8 +5,10 @@ bin/fc-match
bin/fc-pattern
bin/fc-query
bin/fc-scan
+bin/fc-validate
etc/fonts/conf.avail/10-autohint.conf
etc/fonts/conf.avail/10-no-sub-pixel.conf
+etc/fonts/conf.avail/10-scale-bitmap-fonts.conf
etc/fonts/conf.avail/10-sub-pixel-bgr.conf
etc/fonts/conf.avail/10-sub-pixel-rgb.conf
etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
@@ -15,7 +17,6 @@ etc/fonts/conf.avail/10-unhinted.conf
etc/fonts/conf.avail/11-lcdfilter-default.conf
etc/fonts/conf.avail/11-lcdfilter-legacy.conf
etc/fonts/conf.avail/11-lcdfilter-light.conf
-etc/fonts/conf.avail/20-fix-globaladvance.conf
etc/fonts/conf.avail/20-unhint-small-vera.conf
etc/fonts/conf.avail/25-unhint-nonlatin.conf
etc/fonts/conf.avail/30-metric-aliases.conf
@@ -34,7 +35,7 @@ etc/fonts/conf.avail/70-no-bitmaps.conf
etc/fonts/conf.avail/70-yes-bitmaps.conf
etc/fonts/conf.avail/80-delicious.conf
etc/fonts/conf.avail/90-synthetic.conf
-etc/fonts/conf.d/20-fix-globaladvance.conf
+etc/fonts/conf.d/10-scale-bitmap-fonts.conf
etc/fonts/conf.d/20-unhint-small-vera.conf
etc/fonts/conf.d/30-metric-aliases.conf
etc/fonts/conf.d/30-urw-aliases.conf
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 12:27:12 +0000