[86198] trunk/dports/multimedia/libogg

[ryandesign at macports.org]

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

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

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

Modified: trunk/dports/multimedia/libogg/Portfile
===================================================================
--- trunk/dports/multimedia/libogg/Portfile	2011-10-21 09:59:10 UTC (rev 86197)
+++ trunk/dports/multimedia/libogg/Portfile	2011-10-21 10:51:57 UTC (rev 86198)
@@ -5,6 +5,7 @@
 
 name            libogg
 version         1.3.0
+revision        1
 categories      multimedia
 license         BSD
 platforms       darwin
@@ -23,22 +24,12 @@
                     sha1    a900af21b6d7db1c7aa74eb0c39589ed9db991b8 \
                     rmd160  143fa1639ee2175a6609f32287414d6b23deea6f
 
-post-configure {
-    if {! [variant_isset doc]} {
-        reinplace -E "/^install:/s/install-recursive//" \
-            ${worksrcpath}/doc/Makefile
-    }
-}
+patchfiles          patch-docdir.diff
 
 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 README ${destroot}${docdir}
 }
 
-variant doc description {Install extra documentation} {}
-
 livecheck.url   ${master_sites}
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Added: trunk/dports/multimedia/libogg/files/patch-docdir.diff
===================================================================
--- trunk/dports/multimedia/libogg/files/patch-docdir.diff	                        (rev 0)
+++ trunk/dports/multimedia/libogg/files/patch-docdir.diff	2011-10-21 10:51:57 UTC (rev 86198)
@@ -0,0 +1,22 @@
+--- doc/Makefile.in.orig	2011-08-04 12:37:26.000000000 -0500
++++ doc/Makefile.in	2011-10-21 05:43:24.000000000 -0500
+@@ -208,7 +208,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++docdir = $(datadir)/doc/$(PACKAGE)
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
+--- doc/libogg/Makefile.in.orig	2011-08-04 12:37:26.000000000 -0500
++++ doc/libogg/Makefile.in	2011-10-21 05:46:18.000000000 -0500
+@@ -168,7 +168,7 @@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/ogg
++docdir = $(datadir)/doc/$(PACKAGE)/ogg
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ host = @host@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111021/62f759b3/attachment-0001.html>