[100115] trunk/dports/graphics/fontconfig

[ryandesign at macports.org]

Revision: 100115
          https://trac.macports.org/changeset/100115
Author:   ryandesign at macports.org
Date:     2012-11-28 19:58:50 -0800 (Wed, 28 Nov 2012)
Log Message:
-----------
fontconfig: ensure docbook-utils isn't used even if it's installed (#37131)

Modified Paths:
--------------
    trunk/dports/graphics/fontconfig/Portfile

Added Paths:
-----------
    trunk/dports/graphics/fontconfig/files/
    trunk/dports/graphics/fontconfig/files/patch-docbook-4.2.diff

Modified: trunk/dports/graphics/fontconfig/Portfile
===================================================================
--- trunk/dports/graphics/fontconfig/Portfile	2012-11-29 03:48:57 UTC (rev 100114)
+++ trunk/dports/graphics/fontconfig/Portfile	2012-11-29 03:58:50 UTC (rev 100115)
@@ -36,8 +36,10 @@
 }
 set docdir                  ${prefix}/share/doc/${name}
 
-configure.args              --disable-silent-rules
+patchfiles                  patch-docbook-4.2.diff
 
+configure.args              --disable-silent-rules HASDOCBOOK=no
+
 # We put this into a pre-configure block so it can be evaluated _after_ platform selection.
 pre-configure {
     configure.args-append   --with-add-fonts=[join ${add_fonts} ,]

Added: trunk/dports/graphics/fontconfig/files/patch-docbook-4.2.diff
===================================================================
--- trunk/dports/graphics/fontconfig/files/patch-docbook-4.2.diff	                        (rev 0)
+++ trunk/dports/graphics/fontconfig/files/patch-docbook-4.2.diff	2012-11-29 03:58:50 UTC (rev 100115)
@@ -0,0 +1,17 @@
+Update content to docbook-4.x since we do not have 3.x available in MacPorts
+--- doc/fontconfig-devel.sgml.orig	2012-07-23 21:01:32.000000000 -0500
++++ doc/fontconfig-devel.sgml	2012-11-28 21:42:04.000000000 -0600
+@@ -1,4 +1,4 @@
+-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
++<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
+ <!ENTITY fcatomic SYSTEM "fcatomic.sgml">
+ <!ENTITY fcblanks SYSTEM "fcblanks.sgml">
+ <!ENTITY fccache SYSTEM "fccache.sgml">
+--- doc/fontconfig-user.sgml.orig	2012-07-23 21:01:32.000000000 -0500
++++ doc/fontconfig-user.sgml	2012-11-28 21:42:04.000000000 -0600
+@@ -1,4 +1,4 @@
+-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
+ <!ENTITY version SYSTEM "version.sgml">
+ <!ENTITY confdir SYSTEM "confdir.sgml">
+ ]>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121128/1d30df78/attachment-0001.html>