[86199] trunk/dports/multimedia/libtheora

[ryandesign at macports.org]

Revision: 86199
          http://trac.macports.org/changeset/86199
Author:   ryandesign at macports.org
Date:     2011-10-21 04:00:44 -0700 (Fri, 21 Oct 2011)
Log Message:
-----------
libtheora: remove doc variant and instead always install documentation, and use an unversioned docdir; see #31681

Modified Paths:
--------------
    trunk/dports/multimedia/libtheora/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/libtheora/files/
    trunk/dports/multimedia/libtheora/files/patch-docdir.diff

Modified: trunk/dports/multimedia/libtheora/Portfile
===================================================================
--- trunk/dports/multimedia/libtheora/Portfile	2011-10-21 10:51:57 UTC (rev 86198)
+++ trunk/dports/multimedia/libtheora/Portfile	2011-10-21 11:00:44 UTC (rev 86199)
@@ -7,6 +7,7 @@
 name            libtheora
 epoch           1
 version         1.1.1
+revision        1
 categories      multimedia
 platforms       darwin
 license         BSD
@@ -29,16 +30,11 @@
                     sha1    8dcaa8e61cd86eb1244467c0b64b9ddac04ae262 \
                     rmd160  1d07234bd7e2296c61d6e30fe9816415aa7fd8e5
 
-post-patch {
-    if {! [variant_isset doc]} {
-        reinplace -E "s/^(all|install):.*/\\1:/" \
-            ${worksrcpath}/doc/Makefile.in
-    }
-}
-
 depends_build   port:pkgconfig
 depends_lib     port:libvorbis
 
+patchfiles      patch-docdir.diff
+
 configure.env   SDL_CONFIG=/dev/null
 configure.args  --disable-oggtest \
                 --disable-vorbistest \
@@ -48,10 +44,7 @@
 minimum_xcodeversions   {8 2.5}
 
 post-destroot {
-    set docdir ${prefix}/share/doc/${name}-${version}
-    if {! [variant_isset doc]} {
-        xinstall -d ${destroot}${docdir}
-    }
+    set docdir ${prefix}/share/doc/${name}
     xinstall -m 0644 -W ${worksrcpath} AUTHORS CHANGES COPYING LICENSE README \
         ${destroot}${docdir}
 }
@@ -59,8 +52,6 @@
 test.run        yes
 test.target     check
 
-variant doc description {Install extra documentation} {}
-
 platform darwin powerpc {
     # http://trac.macports.org/ticket/13033
     # http://trac.macports.org/ticket/20141

Added: trunk/dports/multimedia/libtheora/files/patch-docdir.diff
===================================================================
--- trunk/dports/multimedia/libtheora/files/patch-docdir.diff	                        (rev 0)
+++ trunk/dports/multimedia/libtheora/files/patch-docdir.diff	2011-10-21 11:00:44 UTC (rev 86199)
@@ -0,0 +1,22 @@
+--- doc/Makefile.in.orig	2009-10-01 13:04:07.000000000 -0500
++++ doc/Makefile.in	2011-10-21 05:52:45.000000000 -0500
+@@ -161,7 +161,7 @@
+ 
+ SUBDIRS = spec
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ static_docs = vp3-format.txt color.html \
+ 	draft-ietf-avt-rtp-theora-00.xml \
+--- doc/spec/Makefile.in.orig	2009-10-01 13:04:07.000000000 -0500
++++ doc/spec/Makefile.in	2011-10-21 05:57:02.000000000 -0500
+@@ -162,7 +162,7 @@
+ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
+ sys_symbol_underscore = @sys_symbol_underscore@
+ 
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ 
+ built_docs = Theora.pdf
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111021/e73b10ef/attachment.html>