Changeset 81389

Timestamp:

07/29/11 18:52:49 (4 years ago)

Author:

ryandesign@…

Message:

pango, pango-devel: add variant to build modules statically instead of dynamically (#12735); use unversioned docdir

Location:

trunk/dports/x11

Files:

• pango-devel/Portfile (modified) (3 diffs)
• pango/Portfile (modified) (3 diffs)

trunk/dports/x11/pango-devel/Portfile

@@ -9 +9 @@
 set my_name             pango
 version                 1.29.3
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
@@ -107 +108 @@
     --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 {
@@ -126 +131 @@
         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 \

trunk/dports/x11/pango/Portfile

@@ -9 +9 @@
 epoch                   1
 version                 1.28.4
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
@@ -105 +106 @@
     --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 {
@@ -124 +129 @@
         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 \