<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5b50f17ede8e68b7a44aac2d08adf86c0c1c71a4">https://github.com/macports/macports-ports/commit/5b50f17ede8e68b7a44aac2d08adf86c0c1c71a4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5b50f17 aap: update to 1.094
</span>5b50f17 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5b50f17ede8e68b7a44aac2d08adf86c0c1c71a4
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Fri Oct 27 12:05:45 2017 +0000
<span style='display:block; white-space:pre;color:#404040;'> aap: update to 1.094
</span>---
devel/aap/Portfile | 15 ++++++++-------
devel/aap/files/patch-destroot.diff | 22 +++++++++++-----------
.../{patch-python26.diff => patch-python27.diff} | 6 +++---
3 files changed, 22 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/aap/Portfile b/devel/aap/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9d42160..d1f2b89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/aap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/aap/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name aap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.091
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.094
</span> categories devel
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,15 +22,16 @@ homepage http://www.a-a-p.org/
</span> master_sites sourceforge:a-a-p
use_zip yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 4f91e48292457826251ec2fddcd3ad9a4814c8ed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 59cb689cd2e36621e00b5c0f3e53ee50129cdff5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 7e8d043a3928c8e7688c1302acc21fe9c5a0f8ed \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 88a5a026d89d3ab5cf657667eed39a1c8de291a4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3f53b2fc277756042449416150acc477f29de93692944f8a77e8cef285a1efd8
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:python26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:python27
</span>
extract.mkdir yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-destroot.diff patch-python26.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-destroot.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-python27.diff
</span>
post-patch {
reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/aap
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +42,7 @@ use_configure no
</span> build {}
destroot.cmd ./aap
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args PREFIX=${prefix} MANSUBDIR=share/man
</span>
post-destroot {
set docdir ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/aap/files/patch-destroot.diff b/devel/aap/files/patch-destroot.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d51acaa..eb6607d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/aap/files/patch-destroot.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/aap/files/patch-destroot.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aap-1.091.orig/main.aap 2010-02-10 14:55:04.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aap-1.091/main.aap 2010-02-10 15:49:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- main.aap.orig 2015-06-06 11:49:26.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ main.aap 2017-10-27 12:00:00.000000000 +0000
</span> @@ -5,7 +5,7 @@
:attr all {comment = Same as "test"}
:attr clean {comment = Cleanup after testing}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> :attr uninstall {comment = Uninstall current version of Aap; use PREFIX=path to specify where; use VERSION=1.123 to specify a different version}
:attr tags {comment = Create a tags file (requires Exuberant ctags)}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,15 +31,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,15 +34,16 @@
</span> install:
@if os.name == 'posix':
PREFIX = `os.path.expanduser(_no.PREFIX)`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span>
# Get the version string from AapVersion.py, because $VERSIONSTR is
# from the current Aap, which may be older.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,16 +48,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,16 +51,22 @@
</span> stdin).group(1) | :assign Version
# Directories to be used.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,10 +44,10 @@
</span> docdir = $dir/doc
htmldocdir = $docdir$?HTMLDIR
- bindir = $PREFIX/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- mandir = $PREFIX/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mandir = $PREFIX/$MANSUBDIR/man1
</span> - sharedocdir = $PREFIX/share/doc
+ bindir = $DESTDIR/bin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mandir = $DESTDIR/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mandir = $DESTDIR/$MANSUBDIR/man1
</span> + sharedocdir = $DESTDIR/share/doc
sharedocdiraap = $sharedocdir/aap
sharehtmldocdir = $sharedocdiraap$?HTMLDIR
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +60,7 @@
</span>
# Copy the files.
:mkdir {r}{f} $toolsdir $modulesdir
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,10 +80,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -76,10 +83,10 @@
</span> # Create symbolic links for the docs dir.
@if os.path.exists(sharedocdir):
:print Creating a symbolic link for "aap" in $sharedocdir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@
</span> @else:
indexstr = $htmldocdir/index.html
htmlstr = $htmldocdir/*.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,7 +123,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,7 +126,7 @@
</span> # Create symbolic links for the program.
:print Creating a symbolic link for "aap" in $bindir
:mkdir {f} $bindir
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -84,7 +84,7 @@
</span>
@elif os.name in ["win32", "mswin", "nt"]:
# On MS-Windows we write an aap.bat file in the Windows directory.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -156,26 +163,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -159,26 +166,27 @@
</span> uninstall:
@if os.name == 'posix':
PREFIX = `os.path.expanduser(_no.PREFIX)`
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +98,9 @@
</span> VERSION ?= $VERSIONSTR
- dir = $PREFIX/lib/aap/Exec-$VERSION
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- mandir = $PREFIX/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- mandir = $PREFIX/$MANSUBDIR/man1
</span> + dir = $DESTDIR/lib/aap/Exec-$VERSION
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mandir = $DESTDIR/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mandir = $DESTDIR/$MANSUBDIR/man1
</span>
# Only delete the bin/aap and share/doc symlinks if they point to the
# version we uninstalled.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/aap/files/patch-python26.diff b/devel/aap/files/patch-python27.diff
</span>similarity index 51%
rename from devel/aap/files/patch-python26.diff
rename to devel/aap/files/patch-python27.diff
<span style='display:block; white-space:pre;color:#808080;'>index d221939..5993144 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/aap/files/patch-python26.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/aap/files/patch-python27.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- aap-1.091.orig/aap 2010-02-10 14:55:04.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ aap-1.091/aap 2010-02-10 15:34:29.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- aap.orig 2004-06-14 16:44:36.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ aap 2017-10-27 12:00:00.000000000 +0000
</span> @@ -1,4 +1,4 @@
-#! /usr/bin/env python
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#!@@PREFIX@@/bin/python2.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#!@@PREFIX@@/bin/python2.7
</span> # Part of the A-A-P recipe executive: The main program.
# Copyright (C) 2002-2003 Stichting NLnet Labs
</pre><pre style='margin:0'>
</pre>