<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[122336] users/devans/dports/gnome</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/122336">122336</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-07-20 21:49:15 -0700 (Sun, 20 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>devans/dports: oregano, copy from trunk and update to version 0.82 for testing.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansdportsgnomeoreganoPortfile">users/devans/dports/gnome/oregano/Portfile</a></li>
<li><a href="#usersdevansdportsgnomeoreganofilespatchautogenshdiff">users/devans/dports/gnome/oregano/files/patch-autogen.sh.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>users/devans/dports/gnome/oregano/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansdportsgnomeoreganofilespatchconfigureacdiff">users/devans/dports/gnome/oregano/files/patch-configure.ac.diff</a></li>
<li><a href="#usersdevansdportsgnomeoreganofilespatchglib232diff">users/devans/dports/gnome/oregano/files/patch-glib-2.32.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansdportsgnomeoreganoPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/dports/gnome/oregano/Portfile (122328 => 122336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/oregano/Portfile 2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/Portfile 2014-07-21 04:49:15 UTC (rev 122336)
</span><span class="lines">@@ -4,8 +4,7 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx">
</span><del>-github.setup marc-lorber oregano 0.73 v
-revision 1
</del><ins>+github.setup marc-lorber oregano 0.82 v
</ins><span class="cx"> categories gnome science
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -15,42 +14,37 @@
</span><span class="cx">
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><del>-checksums rmd160 ff758dea4a5c5e37c594d474a5af263c6c172949 \
- sha256 7d7a6da253bf5e19de553c6e113fd444a5e8eb3aad3055c83d7df08736362d19
</del><ins>+checksums rmd160 4b68fe79161e0b5034cd401eddec52c1478653de \
+ sha256 b68cdd0c80421b0571bf520d3f8b0d1793808fee1ac7ac28dcf8ebaff2cb1a2d
</ins><span class="cx">
</span><span class="cx"> depends_build port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:libtool \
</span><del>- port:pkgconfig
</del><ins>+ port:pkgconfig \
+ port:gnome-doc-utils
</ins><span class="cx">
</span><del>-depends_lib port:gtksourceview2 \
- port:libgnomecanvas \
- port:libgnomeui \
- port:rarian \
</del><ins>+depends_lib port:gtk3 \
+ port:gtksourceview3 \
+ port:libxml2 \
+ port:goocanvas2 \
</ins><span class="cx"> port:desktop-file-utils \
</span><del>- port:shared-mime-info
</del><ins>+ port:shared-mime-info \
+ port:rarian
</ins><span class="cx">
</span><span class="cx"> depends_run port:yelp
</span><span class="cx">
</span><del>-post-extract {
- move ${worksrcpath}/configure.in ${worksrcpath}/configure.ac
- file mkdir ${worksrcpath}/m4
-}
</del><ins>+patchfiles patch-autogen.sh.diff
</ins><span class="cx">
</span><del>-patchfiles patch-autogen.sh.diff \
- patch-configure.ac.diff \
- patch-glib-2.32.diff
</del><ins>+configure.cmd ./autogen.sh
</ins><span class="cx">
</span><del>-use_autoreconf yes
-autoreconf.cmd ./autogen.sh
-
</del><span class="cx"> configure.args --disable-silent-rules \
</span><span class="cx"> --disable-update-mimedb \
</span><del>- --disable-update-mime
</del><ins>+ --disable-schemas-compile
</ins><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> system "${prefix}/bin/scrollkeeper-update"
</span><span class="cx"> system "${prefix}/bin/update-desktop-database ${prefix}/share/applications"
</span><span class="cx"> system "${prefix}/bin/update-mime-database ${prefix}/share/mime"
</span><ins>+ system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</ins><span class="cx"> }
</span></span></pre></div>
<a id="usersdevansdportsgnomeoreganofilespatchautogenshdiff"></a>
<div class="modfile"><h4>Modified: users/devans/dports/gnome/oregano/files/patch-autogen.sh.diff (122328 => 122336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/oregano/files/patch-autogen.sh.diff 2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/files/patch-autogen.sh.diff 2014-07-21 04:49:15 UTC (rev 122336)
</span><span class="lines">@@ -1,13 +1,31 @@
</span><del>---- autogen.sh.orig 2012-01-08 03:24:22.000000000 -0600
-+++ autogen.sh 2012-05-11 10:40:03.000000000 -0500
-@@ -15,8 +15,8 @@
</del><ins>+--- autogen.sh.orig 2012-05-08 09:58:54.000000000 -0700
++++ autogen.sh 2014-07-20 21:07:40.000000000 -0700
+@@ -317,20 +317,20 @@
</ins><span class="cx">
</span><del>- # Refresh GNU autotools toolchain.
- echo Cleaning autotools files...
--find -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
--find -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
-+find . -type d -name autom4te.cache -print0 | xargs -0 rm -rf \;
-+find . -type f \( -name missing -o -name install-sh -o -name mkinstalldirs \
- -o -name depcomp -o -name ltmain.sh -o -name configure \
- -o -name config.sub -o -name config.guess \
- -o -name Makefile.in \) -print0 | xargs -0 rm -f
</del><ins>+ case $REQUIRED_AUTOMAKE_VERSION in
+ 1.4*) automake_progs="automake-1.4" ;;
+- 1.5*) automake_progs="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.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7 automake-1.6" ;;
+- 1.7*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8 automake-1.7" ;;
+- 1.8*) automake_progs="automake-1.11 automake-1.10 automake-1.9 automake-1.8" ;;
+- 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" ;;
+ esac
+ version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \
+ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"
+ ACLOCAL=`echo $AUTOMAKE | sed s/automake/aclocal/`
+
+ if $want_libtool; then
+- version_check libtool LIBTOOLIZE libtoolize $REQUIRED_LIBTOOL_VERSION \
++ version_check libtool LIBTOOLIZE glibtoolize $REQUIRED_LIBTOOL_VERSION \
+ "http://ftp.gnu.org/pub/gnu/libtool/libtool-$REQUIRED_LIBTOOL_VERSION.tar.gz"
+ require_m4macro libtool.m4
+ fi
</ins></span></pre></div>
<a id="usersdevansdportsgnomeoreganofilespatchconfigureacdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/dports/gnome/oregano/files/patch-configure.ac.diff (122328 => 122336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/oregano/files/patch-configure.ac.diff 2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/files/patch-configure.ac.diff 2014-07-21 04:49:15 UTC (rev 122336)
</span><span class="lines">@@ -1,17 +0,0 @@
</span><del>---- configure.ac.orig 2012-01-14 03:36:27.000000000 -0600
-+++ configure.ac 2013-05-23 05:14:53.000000000 -0500
-@@ -1,12 +1,12 @@
- AC_INIT(oregano-0.73, 0.73)
- AM_INIT_AUTOMAKE(oregano, 0.73)
-
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
- AM_MAINTAINER_MODE
-
- AC_CONFIG_MACRO_DIR([m4])
-
--m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])œ
-+m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
-
- GETTEXT_PACKAGE=oregano
- AC_SUBST(GETTEXT_PACKAGE)
</del></span></pre></div>
<a id="usersdevansdportsgnomeoreganofilespatchglib232diff"></a>
<div class="delfile"><h4>Deleted: users/devans/dports/gnome/oregano/files/patch-glib-2.32.diff (122328 => 122336)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/oregano/files/patch-glib-2.32.diff 2014-07-21 03:45:29 UTC (rev 122328)
+++ users/devans/dports/gnome/oregano/files/patch-glib-2.32.diff 2014-07-21 04:49:15 UTC (rev 122336)
</span><span class="lines">@@ -1,51 +0,0 @@
</span><del>---- src/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/Makefile.am 2012-06-06 18:04:54.000000000 -0500
-@@ -6,7 +6,7 @@
- stock \
- pixmaps
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/engines/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/engines/Makefile.am 2012-06-06 18:04:58.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -g -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -g -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/gplot/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/gplot/Makefile.am 2012-06-06 18:04:56.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES
---- src/model/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/model/Makefile.am 2012-06-06 18:04:53.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED \
- -DG_DISABLE_SINGLE_INCLUDES -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \
---- src/sheet/Makefile.am.orig 2012-01-14 03:36:27.000000000 -0600
-+++ src/sheet/Makefile.am 2012-06-06 18:04:51.000000000 -0500
-@@ -1,6 +1,6 @@
- oreganodir = $(datadir)/oregano
-
--AM_CFLAGS = -Wall -DG_DISABLE_DEPRECATED -DGSEAL_ENABLE \
-+AM_CFLAGS = -Wall -DGSEAL_ENABLE \
- -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES \
- -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES
</del></span></pre>
</div>
</div>
</body>
</html>