- Update to 1.091

PR:		140275
Submitted by:	Florian Smeets <flo@kasimir.com>

4 files changed, 4 insertions, 84 deletions

diff --git a/devel/aap/Makefile b/devel/aap/Makefile
index 865c726d9cd7..4fbe64e221eb 100644
--- a/devel/aap/Makefile
+++ b/devel/aap/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	aap
-PORTVERSION=	1.090
-PORTREVISION=	1
+PORTVERSION=	1.091
 CATEGORIES=	devel
 MASTER_SITES=	SF/a-a-p/Aap/${PORTVERSION}
 
@@ -31,10 +30,6 @@ FULLDOCS=no
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_VER} >= 2.5
-EXTRA_PATCHES=	${FILESDIR}/extra-Sign.py
-.endif
-
 do-install:
 	@cd ${WRKSRC} && \
 		${PYTHON_CMD} ./aap PREFIX="${PREFIX}" FULLDOCS=${FULLDOCS} \
diff --git a/devel/aap/distinfo b/devel/aap/distinfo
index 9be23bcf23f1..6c9131c541c2 100644
--- a/devel/aap/distinfo
+++ b/devel/aap/distinfo
@@ -1,3 +1,3 @@
-MD5 (aap-1.090.zip) = 6fef135ef229ba6c5aea57aa1a9b8c71
-SHA256 (aap-1.090.zip) = 621a4ea69dd5126e75826fcd7d19c18317b4f5f598b226cb40f64475c56318f4
-SIZE (aap-1.090.zip) = 1645406
+MD5 (aap-1.091.zip) = 6c7820e7596bd5be5cde29030d3cdf3b
+SHA256 (aap-1.091.zip) = 1cae4e5c6426f3862ef6795e3e1966ef15ab618cde57be2005a0a6c6eac41aae
+SIZE (aap-1.091.zip) = 1645498
diff --git a/devel/aap/files/extra-Sign.py b/devel/aap/files/extra-Sign.py
deleted file mode 100644
index 18c12c39725a..000000000000
--- a/devel/aap/files/extra-Sign.py
+++ /dev/null
@@ -1,40 +0,0 @@
---- Sign.py.orig	2009-05-27 14:09:55.000000000 +0200
-+++ Sign.py	2009-05-27 14:13:27.000000000 +0200
-@@ -11,7 +11,7 @@
- import os
- import os.path
- import string
--import md5
-+import hashlib
- import time
- 
- from Util import *
-@@ -272,7 +272,7 @@
- 
-     try:
-         f = open(fname, "rb")
--        m = md5.new()
-+        m = hashlib.md5()
-         while 1:
-             # Read big blocks at a time for speed, but don't read the whole
-             # file at once to reduce memory usage.
-@@ -301,7 +301,7 @@
-                                                              % fname) + str(e))
-         return "unknown"
- 
--    m = md5.new()
-+    m = hashlib.md5()
- 
-     inquote = 0
-     incomment = 0
-@@ -404,7 +404,9 @@
- 
- def buildcheckstr2sign(str):
-     """Compute a signature from a string for the buildcheck."""
--    return hexdigest(md5.new(str))
-+    m = hashlib.md5()
-+    m.update(str)
-+    return hexdigest(m)
- 
- 
- def _sign_lookup(signatures, name, key):
diff --git a/devel/aap/files/patch-Filetype.py b/devel/aap/files/patch-Filetype.py
deleted file mode 100644
index 4fa4f1f71f23..000000000000
--- a/devel/aap/files/patch-Filetype.py
+++ /dev/null
@@ -1,35 +0,0 @@
---- Filetype.py.orig	2009-05-14 15:19:42.000000000 +0200
-+++ Filetype.py	2009-05-14 15:20:50.000000000 +0200
-@@ -1414,12 +1414,12 @@
-             rline = items[1]
-         rline_len = len(rline)
-         # isolate first argument, which may be in quotes
--        as = 0
--        if as < rline_len:
--            if rline[as] == '"' or rline[as] == "'":
--                quote = rline[as]
--                as = as + 1
--                ae = as
-+        vas = 0
-+        if vas < rline_len:
-+            if rline[vas] == '"' or rline[vas] == "'":
-+                quote = rline[vas]
-+                vas = vas + 1
-+                ae = vas
-                 while ae < rline_len and rline[ae] != quote:
-                     ae = ae + 1
-                 if ae == rline_len:
-@@ -1427,11 +1427,11 @@
-                                            % (line_idx + recipe_line_nr, line))
-                 n = ae + 1
-             else:
--                ae = as
-+                ae = vas
-                 while ae < rline_len and rline[ae] != ' ' and rline[ae] != '\t':
-                     ae = ae + 1
-                 n = ae
--            arg1 = rline[as:ae]
-+            arg1 = rline[vas:ae]
-         else:
-             arg1 = ''
-             n = rline_len