[csw-devel] SF.net SVN: gar:[21383] csw/mgar/pkg/fontconfig/branches/nim/Makefile

[mattdarcy at users.sourceforge.net]

Revision: 21383
          http://gar.svn.sourceforge.net/gar/?rev=21383&view=rev
Author:   mattdarcy
Date:     2013-06-20 14:36:43 +0000 (Thu, 20 Jun 2013)
Log Message:
-----------
test to try to fix the libxml2 dependency with bts

Modified Paths:
--------------
    csw/mgar/pkg/fontconfig/branches/nim/Makefile

Modified: csw/mgar/pkg/fontconfig/branches/nim/Makefile
===================================================================
--- csw/mgar/pkg/fontconfig/branches/nim/Makefile	2013-06-20 14:02:47 UTC (rev 21382)
+++ csw/mgar/pkg/fontconfig/branches/nim/Makefile	2013-06-20 14:36:43 UTC (rev 21383)
@@ -2,7 +2,7 @@
 
 NAME = fontconfig
 VERSION = 2.10.2
-GARTYPE = bts
+GARTYPE = v2
 
 DESCRIPTION = A library for configuring and customizing font access
 define BLURB
@@ -35,7 +35,7 @@
 # PKGFILES is catchall
 RUNTIME_DEP_PKGS_NIMOSSfontconfig += NIMOSSlibfontconfig1
 # This is for /usr/share/fonts which is ok
-CHECKPKG_OVERRIDES_NIMOSSfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/fontconfig/fonts.conf
+CHECKPKG_OVERRIDES_NIMOSSfontconfig += file-with-bad-content|/usr/share|root/etc/opt/csw/nimoss/fontconfig/fonts.conf
 
 OBSOLETED_BY_NIMOSSfontconfig += NIMOSSfconfig
 CATALOGNAME_NIMOSSfconfig = fontconfig_stub
@@ -46,8 +46,8 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-default-fonts=/usr/openwin/lib/X11/fonts
-CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/share/fonts
-CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/cache/fontconfig
-CONFIGURE_ARGS += --with-baseconfigdir=/etc/opt/csw/fontconfig
+CONFIGURE_ARGS += --with-add-fonts=/usr/openwin/lib/locale,/usr/share/fonts,/opt/csw/nimoss/share/fonts
+CONFIGURE_ARGS += --with-cache-dir=/var/opt/csw/nimoss/cache/fontconfig
+CONFIGURE_ARGS += --with-baseconfigdir=/etc/opt/csw/nimoss//fontconfig
 
 include gar/category.mk

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