svn commit: r316671 - in head/mail/svnmailer: . files
Ruslan Mahmatkhanov
rm at FreeBSD.org
Sat Apr 27 15:57:17 UTC 2013
Author: rm
Date: Sat Apr 27 15:57:16 2013
New Revision: 316671
URL: http://svnweb.freebsd.org/changeset/ports/316671
Log:
- rename patch, since it's now applied uncoditionally and remove EXTRA_PATCHES[1]
- remove indefinite article from COMMENT
- eliminate PYTHON_SITELIBDIR from dependencies
- limit python version to 2.x only
Non-functional changes, so no PORTREVISION bump is required
Discussed with: eadler
Added:
head/mail/svnmailer/files/patch-src-lib-svnmailer-notifier-_base.py
- copied unchanged from r316669, head/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py
Deleted:
head/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py
Modified:
head/mail/svnmailer/Makefile
Modified: head/mail/svnmailer/Makefile
==============================================================================
--- head/mail/svnmailer/Makefile Sat Apr 27 15:52:00 2013 (r316670)
+++ head/mail/svnmailer/Makefile Sat Apr 27 15:57:16 2013 (r316671)
@@ -9,13 +9,13 @@ MASTER_SITES= http://storage.perlig.de/$
PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
MAINTAINER= ports at FreeBSD.org
-COMMENT= A tool to post subversion repository commit information
+COMMENT= Tool to post subversion repository commit information
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/py-subversion
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}subversion>0:${PORTSDIR}/devel/py-subversion
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USE_BZIP2= YES
-USE_PYTHON= 2.5+
+USE_BZIP2= yes
+USE_PYTHON= -2.7
USE_PYDISTUTILS= yes
PYDISTUTILS_PKGVERSION= ${DISTVERSION}
@@ -23,8 +23,6 @@ MAN1= svn-mailer.1
PORTDOCS= *
-EXTRA_PATCHES= ${FILESDIR}/py25-src-lib-svnmailer-notifier-_base.py
-
.include <bsd.port.options.mk>
.if ! ${PORT_OPTIONS:MDOCS}
Copied: head/mail/svnmailer/files/patch-src-lib-svnmailer-notifier-_base.py (from r316669, head/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/svnmailer/files/patch-src-lib-svnmailer-notifier-_base.py Sat Apr 27 15:57:16 2013 (r316671, copy of r316669, head/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py)
@@ -0,0 +1,45 @@
+--- src/lib/svnmailer/notifier/_base.py.orig 2005-09-25 14:51:23.000000000 +0000
++++ src/lib/svnmailer/notifier/_base.py 2007-08-20 17:29:23.000000000 +0000
+@@ -376,7 +376,6 @@
+ :return: The two encodings (``('enc1', 'enc2')``)
+ :rtype: ``tuple``
+ """
+- from encodings import exceptions
+
+ enc1 = enc2 = default
+ if not change.wasAdded() or change.wasCopied():
+@@ -384,7 +383,7 @@
+ enc1 = self._getContentEncoding(
+ change.getBasePath(), change.getBaseRevision()
+ )
+- except exceptions.LookupError:
++ except LookupError:
+ """ fall back """
+ pass
+
+@@ -395,7 +394,7 @@
+ enc2 = self._getContentEncoding(
+ change.path, change.revision
+ )
+- except exceptions.LookupError:
++ except LookupError:
+ """ fall back """
+ pass
+
+@@ -423,7 +422,6 @@
+ The specified encoding is not implemented or no encoding
+ was specified
+ """
+- from encodings import exceptions
+
+ # first try the svn:mime-type
+ enc = self.getEncodingFromMimeType(path, revision)
+@@ -461,7 +459,7 @@
+ codecs.lookup(enc)
+ return enc
+
+- raise exceptions.LookupError("No Encoding configured")
++ raise LookupError("No Encoding configured")
+
+
+ def getEncodingFromMimeType(self, path, revision):
More information about the svn-ports-all
mailing list