[csw-devel] SF.net SVN: gar:[3119] csw/mgar/pkg/fontconfig/trunk

[a_o_m at users.sourceforge.net]

Revision: 3119
          http://gar.svn.sourceforge.net/gar/?rev=3119&view=rev
Author:   a_o_m
Date:     2009-02-16 13:33:51 +0000 (Mon, 16 Feb 2009)

Log Message:
-----------
fontconfig: update to version 2.6.0

Modified Paths:
--------------
    csw/mgar/pkg/fontconfig/trunk/Makefile
    csw/mgar/pkg/fontconfig/trunk/checksums
    csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.gspec

Added Paths:
-----------
    csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall

Property Changed:
----------------
    csw/mgar/pkg/fontconfig/trunk/


Property changes on: csw/mgar/pkg/fontconfig/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v1

   + gar https://gar.svn.sf.net/svnroot/gar/csw/mgar/gar/v2


Modified: csw/mgar/pkg/fontconfig/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/Makefile	2009-02-16 13:23:33 UTC (rev 3118)
+++ csw/mgar/pkg/fontconfig/trunk/Makefile	2009-02-16 13:33:51 UTC (rev 3119)
@@ -1,5 +1,5 @@
 GARNAME = fontconfig
-GARVERSION = 2.2.1
+GARVERSION = 2.6.0
 CATEGORIES = lib
 
 DESCRIPTION = A library for configuring and customizing font access.
@@ -12,11 +12,20 @@
 
 MASTER_SITES = http://www.fontconfig.org/release/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz 
-DISTFILES += $(call admfiles,CSWfconfig,)
+DISTFILES += $(call admfiles,CSWfconfig,postinstall)
 
+REQUIRED_PKGS = CSWexpat CSWftype2 CSWzlib CSWiconv
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
 
+CONFIGURE_ARGS = $(DIRPATHS) --with-default-fonts=/usr/openwin/lib/X11/fonts --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts --with-cache-dir=/opt/csw/var/cache-fontconfig --with-confdir=/opt/csw/etc/fontconfig
+
+pre-package:
+	@rm -f $(DESTDIR)$(libdir)/libfontconfig.la*
+	@rm -f $(DESTDIR)/opt/csw/etc/fonts/fonts.conf.bak
+	@$(MAKECOOKIE)
+
 include gar/category.mk

Modified: csw/mgar/pkg/fontconfig/trunk/checksums
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/checksums	2009-02-16 13:23:33 UTC (rev 3118)
+++ csw/mgar/pkg/fontconfig/trunk/checksums	2009-02-16 13:33:51 UTC (rev 3119)
@@ -1,2 +1,4 @@
-a6a856606809b9ebfcc37a6380dcd6df  download/fontconfig-2.2.1.tar.gz
-0648293f2b2448ce03f4f8413b010ad2  download/CSWfconfig.gspec
+ab54ec1d4ddd836313fdbc0cd5299d6d  download/fontconfig-2.6.0.tar.gz
+4db7301f43d63ad83a48b1cca7a6d4be  download/CSWfconfig.gspec
+eeb4246a85f1ac5215dc66ee0fe3fb8e  download/CSWfconfig.postinstall
+82f9a47f7f3855b2922bbcc79ba0eec4  download/fonts.conf.diff

Modified: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.gspec
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.gspec	2009-02-16 13:23:33 UTC (rev 3118)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.gspec	2009-02-16 13:33:51 UTC (rev 3119)
@@ -1,4 +1,4 @@
 %var            bitname fontconfig
 %var            pkgname CSWfconfig
 %include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYRIGHT
+%copyright      url file://%{WORKSRC}/COPYING

Added: csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall
===================================================================
--- csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall	                        (rev 0)
+++ csw/mgar/pkg/fontconfig/trunk/files/CSWfconfig.postinstall	2009-02-16 13:33:51 UTC (rev 3119)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+CHROOTDIR=${BASEDIR:-/}
+
+echo 
+echo fc-cache is running now to build font information caches
+echo this may take up to several minutes on slow workstations
+echo
+
+${BASEDIR}/usr/sbin/chroot ${CHROOTDIR} /opt/csw/bin/fc-cache -f -s
+
+# removing ancient fonts.cache-csw-1 files from fontconfig-2.3.2
+find /usr/openwin/lib/X11/fonts -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+find /usr/openwin/lib/locale -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+find /opt/csw -user root -name fonts.cache-csw-1 -exec rm -f {} \;
+ 
+exit 0


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.