[123123] trunk/dports/gnome/gtk-doc/Portfile

[David Evans]

On 8/29/14 10:07 PM, Lawrence Velázquez wrote:
> I just reverted r123123 and successfully built appstream-glib from scratch in a Lion VM with the system Vim (MacPorts vim deactivated). I'm inclined to think that #44546 was resolved incorrectly.
>
> vq
Perhaps but the ticket was reported against version 0.2.3 and 0.2.5 is 
now current so that could also explain your result.  According to 
gtk-doc's configure.ac, for vim to work it must be built with the 
+syntax feature as reported in 'vim --version'.  gtk-doc also supports 
using source-highlight or highlight in addition to vim and, in fact, 
prefers source-highlight.

Patch attached for gtk-doc to use source-highlight instead of vim. Works 
for me with appstream-glib 0.2.5 on Mavericks.  Can you try it on your 
Lion VM?

Thanks

Dave
>
>
> On Aug 29, 2014, at 10:58 PM, Jeremy Huddleston Sequoia <jeremyhu at apple.com> wrote:
>
>> This introduces a dependency cycle which prevents a ton of stuff from building =(
>>
>> gtk2 depends on gtk-doc
>> gtk-doc depends on vim
>> vim+gtk2 depends on gtk2
>>
>> The workaround is to first install vim -gtk2, then install gtk-doc, then install vim +gtk2.
>>
>> Please find another way.
>>
>>> On Aug 5, 2014, at 17:09, devans at macports.org wrote:
>>>
>>> Revision
>>> 123123
>>> Author
>>> devans at macports.org
>>> Date
>>> 2014-08-05 17:09:00 -0700 (Tue, 05 Aug 2014)
>>> Log Message
>>>
>>> gtk-doc: depend on MacPorts vim, OS X /usr/bin/vim doesn't always work (#44546).
>>> Modified Paths
>>>
>>> 	• trunk/dports/gnome/gtk-doc/Portfile
>>> Diff
>>>
>>> Modified: trunk/dports/gnome/gtk-doc/Portfile (123122 => 123123)
>>>
>>> --- trunk/dports/gnome/gtk-doc/Portfile	2014-08-05 23:47:29 UTC (rev 123122)
>>> +++ trunk/dports/gnome/gtk-doc/Portfile	2014-08-06 00:09:00 UTC (rev 123123)
>>>
>>> @@ -5,7 +5,7 @@
>>>
>>>
>>>
>>> name            gtk-doc
>>>
>>> version         1.20
>>>
>>> -revision        2
>>>
>>> +revision        3
>>>
>>> categories      gnome devel
>>>
>>> license         GPL-2+
>>>
>>> installs_libs   no
>>>
>>> @@ -31,6 +31,8 @@
>>>
>>> depends_build   port:pkgconfig \
>>>
>>>                  path:lib/pkgconfig/glib-2.0.pc:glib2
>>>
>>>
>>>
>>> +# vim is used by some scripts for source highlighting and OS X /usr/bin/vim doesn't always work (#44546)
>>> +
>>>
>>> depends_lib     port:libxml2 \
>>>
>>>                  port:libxslt \
>>>
>>>                  path:bin/perl:perl5 \
>>>
>>> @@ -38,7 +40,8 @@
>>>
>>>                  port:fop \
>>>
>>>                  port:docbook-xml \
>>>
>>>                  port:docbook-xsl \
>>>
>>> -                port:itstool
>>>
>>> +                port:itstool \
>>> +                port:vim
>>>
>>>
>>>
>>> patchfiles      patch-gtkdoc-mkdb.in.diff
>>>
>>>
>>>
>>> _______________________________________________
>>> macports-changes mailing list
>>> macports-changes at lists.macosforge.org
>>> https://lists.macosforge.org/mailman/listinfo/macports-changes
>> _______________________________________________
>> macports-dev mailing list
>> macports-dev at lists.macosforge.org
>> https://lists.macosforge.org/mailman/listinfo/macports-dev
>

-------------- next part --------------
Index: Portfile
===================================================================
--- Portfile	(revision 124886)
+++ Portfile	(working copy)
@@ -5,7 +5,7 @@
 
 name            gtk-doc
 version         1.20
-revision        4
+revision        5
 categories      gnome devel
 license         GPL-2+
 installs_libs   no
@@ -41,13 +41,14 @@
                 port:docbook-xml \
                 port:docbook-xsl \
                 port:itstool \
-                port:vim
+                port:source-highlight
 
 patchfiles      patch-gtkdoc-mkdb.in.diff
 
 configure.perl  ${prefix}/bin/perl5.16
 configure.env-append XSLTPROC=${prefix}/bin/xsltproc
-configure.args  --with-xml-catalog=${prefix}/etc/xml/catalog
+configure.args  --with-xml-catalog=${prefix}/etc/xml/catalog \
+                --with-highlight=source-highlight
 
 # TODO Enable test support.