[81389] trunk/dports/x11

[ryandesign at macports.org]

Revision: 81389
          http://trac.macports.org/changeset/81389
Author:   ryandesign at macports.org
Date:     2011-07-29 18:52:49 -0700 (Fri, 29 Jul 2011)
Log Message:
-----------
pango, pango-devel: add variant to build modules statically instead of dynamically (#12735); use unversioned docdir

Modified Paths:
--------------
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2011-07-30 01:51:09 UTC (rev 81388)
+++ trunk/dports/x11/pango/Portfile	2011-07-30 01:52:49 UTC (rev 81389)
@@ -8,6 +8,7 @@
 conflicts               pango-devel
 epoch                   1
 version                 1.28.4
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign openmaintainer
@@ -104,6 +105,10 @@
     --disable-introspection \
     --without-x
 
+variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} {
+    configure.args-append   --with-included-modules
+}
+
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 variant x11 {
     depends_lib-append      port:Xft2
@@ -123,17 +128,19 @@
     if {![variant_isset x11]} {
         xinstall -d ${destroot}${prefix}/etc/pango
     }
-    xinstall -m 0644 ${worksrcpath}/modules/pangorc \
-        ${destroot}${prefix}/etc/pango
-    reinplace "s|\\.\\./modules/|${prefix}/etc/pango/|g" \
-        ${destroot}${prefix}/etc/pango/pangorc
-    
-    system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
-        ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/1.6.0/modules/*.so \
-        >${destroot}${prefix}/etc/pango/pango.modules"
-    reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules
-    
-    set docdir ${prefix}/share/doc/${name}-${version}
+    if {![variant_isset builtin_modules]} {
+        xinstall -m 0644 ${worksrcpath}/modules/pangorc \
+            ${destroot}${prefix}/etc/pango
+        reinplace "s|\\.\\./modules/|${prefix}/etc/pango/|g" \
+            ${destroot}${prefix}/etc/pango/pangorc
+
+        system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
+            ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/1.6.0/modules/*.so \
+            >${destroot}${prefix}/etc/pango/pango.modules"
+        reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules
+    }
+
+    set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
     xinstall -m 0644 -W ${worksrcpath} AUTHORS ChangeLog COPYING MAINTAINERS NEWS README THANKS \
         ${destroot}${docdir}

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2011-07-30 01:51:09 UTC (rev 81388)
+++ trunk/dports/x11/pango-devel/Portfile	2011-07-30 01:52:49 UTC (rev 81389)
@@ -8,6 +8,7 @@
 conflicts               pango
 set my_name             pango
 version                 1.29.3
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign openmaintainer
@@ -106,6 +107,10 @@
     --disable-introspection \
     --without-x
 
+variant builtin_modules description {Build the modules into Pango statically (most users do not need this variant)} {
+    configure.args-append   --with-included-modules
+}
+
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 variant x11 {
     depends_lib-append      port:Xft2
@@ -125,17 +130,19 @@
     if {![variant_isset x11]} {
         xinstall -d ${destroot}${prefix}/etc/pango
     }
-    xinstall -m 0644 ${worksrcpath}/modules/pangorc \
-        ${destroot}${prefix}/etc/pango
-    reinplace "s|\\.\\./modules/|${prefix}/etc/pango/|g" \
-        ${destroot}${prefix}/etc/pango/pangorc
-    
-    system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
-        ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/1.6.0/modules/*.so \
-        >${destroot}${prefix}/etc/pango/pango.modules"
-    reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules
-    
-    set docdir ${prefix}/share/doc/${name}-${version}
+    if {![variant_isset builtin_modules]} {
+        xinstall -m 0644 ${worksrcpath}/modules/pangorc \
+            ${destroot}${prefix}/etc/pango
+        reinplace "s|\\.\\./modules/|${prefix}/etc/pango/|g" \
+            ${destroot}${prefix}/etc/pango/pangorc
+
+        system "env LANG=C DYLD_LIBRARY_PATH=${destroot}${prefix}/lib \
+            ${destroot}${prefix}/bin/pango-querymodules ${destroot}${prefix}/lib/pango/1.6.0/modules/*.so \
+            >${destroot}${prefix}/etc/pango/pango.modules"
+        reinplace s|${destroot}||g ${destroot}${prefix}/etc/pango/pango.modules
+    }
+
+    set docdir ${prefix}/share/doc/${name}
     xinstall -d ${destroot}${docdir}
     xinstall -m 0644 -W ${worksrcpath} AUTHORS ChangeLog COPYING MAINTAINERS NEWS README THANKS \
         ${destroot}${docdir}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110729/147b6aea/attachment.html>