[134802] trunk/dports/gnome/oregano

[devans at macports.org]

Revision: 134802
          https://trac.macports.org/changeset/134802
Author:   devans at macports.org
Date:     2015-04-07 11:31:04 -0700 (Tue, 07 Apr 2015)
Log Message:
-----------
oregano: update patch to build with automake-1.15, user manual XML fixups, increment revision.

Modified Paths:
--------------
    trunk/dports/gnome/oregano/Portfile
    trunk/dports/gnome/oregano/files/patch-autogen.sh.diff

Modified: trunk/dports/gnome/oregano/Portfile
===================================================================
--- trunk/dports/gnome/oregano/Portfile	2015-04-07 18:30:34 UTC (rev 134801)
+++ trunk/dports/gnome/oregano/Portfile	2015-04-07 18:31:04 UTC (rev 134802)
@@ -5,6 +5,7 @@
 PortGroup           github 1.0
 
 github.setup        marc-lorber oregano 0.82 v
+revision            1
 categories          gnome science
 maintainers         nomaintainer
 license             GPL-2+
@@ -30,13 +31,26 @@
                     port:desktop-file-utils \
                     port:shared-mime-info
 
-depends_run         port:yelp
+depends_run         port:yelp \
+                    port:docbook-xml
 
 patchfiles          patch-autogen.sh.diff \
                     patch-configure.ac.diff \
                     patch-allow-deprecated.diff \
                     patch-src-netlist-editor.c.diff
 
+post-patch {
+    reinplace "s|/usr/share/xml/docbook/schema/dtd|${prefix}/share/xml/docbook|" \
+        ${worksrcpath}/help/C/oregano.xml \
+        ${worksrcpath}/help/es/oregano.xml \
+        ${worksrcpath}/help/fr/oregano.xml
+    
+    reinplace "s| id=\"legalnotice\"||" \
+        ${worksrcpath}/help/C/legal.xml \
+        ${worksrcpath}/help/es/legal.xml \
+        ${worksrcpath}/help/fr/legal.xml
+}
+
 configure.cmd       ./autogen.sh
 
 configure.args      --disable-silent-rules \

Modified: trunk/dports/gnome/oregano/files/patch-autogen.sh.diff
===================================================================
--- trunk/dports/gnome/oregano/files/patch-autogen.sh.diff	2015-04-07 18:30:34 UTC (rev 134801)
+++ trunk/dports/gnome/oregano/files/patch-autogen.sh.diff	2015-04-07 18:31:04 UTC (rev 134802)
@@ -1,6 +1,6 @@
---- autogen.sh.orig	2014-10-13 01:25:24.000000000 -0700
-+++ autogen.sh	2014-10-13 01:26:23.000000000 -0700
-@@ -317,20 +317,23 @@
+--- autogen.sh.orig	2015-04-07 10:18:54.000000000 -0700
++++ autogen.sh	2015-04-07 10:21:57.000000000 -0700
+@@ -317,20 +317,24 @@
  
  case $REQUIRED_AUTOMAKE_VERSION in
      1.4*) automake_progs="automake-1.4" ;;
@@ -11,16 +11,17 @@
 -    1.9*) automake_progs="automake-1.11 automake-1.10 automake-1.9" ;;
 -    1.10*) automake_progs="automake-1.11 automake-1.10" ;;
 -    1.11*) automake_progs="automake-1.11" ;;
-+    1.5*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
-+    1.6*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
-+    1.7*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
-+    1.8*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
-+    1.9*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
-+    1.10*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
-+    1.11*) automake_progs="automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
-+    1.12*) automake_progs="automake-1.14 automake-1.13 automake-1.12" ;;
-+    1.13*) automake_progs="automake-1.14 automake-1.13" ;;
-+    1.14*) automake_progs="automake-1.14" ;;
++    1.5*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6 automake-1.5" ;;
++    1.6*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
++    1.7*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
++    1.8*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
++    1.9*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10 automake-1.9" ;;
++    1.10*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11 automake-1.10" ;;
++    1.11*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12 automake-1.11" ;;
++    1.12*) automake_progs="automake-1.15 automake-1.14 automake-1.13 automake-1.12" ;;
++    1.13*) automake_progs="automake-1.15 automake-1.14 automake-1.13" ;;
++    1.14*) automake_progs="automake-1.15 automake-1.14" ;;
++    1.15*) automake_progs="automake-1.15" ;;
  esac
  version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
      "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150407/f5b94ead/attachment.html>