ports/140275: [PATCH] devel/aap: update to 1.091

[Florian Smeets]

>Number:         140275
>Category:       ports
>Synopsis:       [PATCH] devel/aap: update to 1.091
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 04 16:40:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Florian Smeets
>Release:        FreeBSD 7.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD mail.solomo.de 7.2-STABLE FreeBSD 7.2-STABLE #10: Fri Oct 16 15:21:55 CEST 2009
>Description:
- Update to 1.091

- the 2 patch files are not needed anymore. this is handled in the software itself now.

Removed file(s):
- files/extra-Sign.py
- files/patch-Filetype.py

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- aap-1.091.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/aap.orig/Makefile /usr/ports/devel/aap/Makefile
--- /usr/ports/devel/aap.orig/Makefile	2009-08-22 02:17:50.000000000 +0200
+++ /usr/ports/devel/aap/Makefile	2009-11-04 17:29:17.000000000 +0100
@@ -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 @@
 
 .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 -ruN --exclude=CVS /usr/ports/devel/aap.orig/distinfo /usr/ports/devel/aap/distinfo
--- /usr/ports/devel/aap.orig/distinfo	2007-08-20 16:48:07.000000000 +0200
+++ /usr/ports/devel/aap/distinfo	2009-11-04 17:29:17.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/devel/aap.orig/files/extra-Sign.py /usr/ports/devel/aap/files/extra-Sign.py
--- /usr/ports/devel/aap.orig/files/extra-Sign.py	2009-06-09 00:30:46.000000000 +0200
+++ /usr/ports/devel/aap/files/extra-Sign.py	1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/devel/aap.orig/files/patch-Filetype.py /usr/ports/devel/aap/files/patch-Filetype.py
--- /usr/ports/devel/aap.orig/files/patch-Filetype.py	2009-06-09 00:30:46.000000000 +0200
+++ /usr/ports/devel/aap/files/patch-Filetype.py	1970-01-01 01:00:00.000000000 +0100
@@ -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
--- aap-1.091.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: