5 files changed, 135 insertions, 40 deletions

diff --git a/mail/svnmailer/Makefile b/mail/svnmailer/Makefile
index 64ea73d64660..1955b1398fab 100644
--- a/mail/svnmailer/Makefile
+++ b/mail/svnmailer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	svnmailer
-PORTVERSION=	1.0.8
+DISTVERSION=	1.1.0-dev-r1373
 CATEGORIES=	mail python
 MASTER_SITES=	http://storage.perlig.de/${PORTNAME}/
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
@@ -16,11 +16,12 @@ COMMENT=	A tool to post subversion repository commit information
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/libsvn/__init__.py:${PORTSDIR}/devel/subversion-python
 
+USE_BZIP2=	YES
 USE_PYTHON=		2.3+
 USE_PYDISTUTILS=	yes
+PYDISTUTILS_PKGVERSION=	${DISTVERSION}
 
-PORTDOCS=	index.html perlig.css perlig.jpg perlig_docs.css \
-		perlig_offline.css right.gif up.gif
+MAN1=		svn-mailer.1
 
 .include <bsd.port.pre.mk>
 
@@ -29,14 +30,14 @@ pre-patch:
 EXTRA_PATCHES=	${FILESDIR}/py25-src-lib-svnmailer-notifier-_base.py
 .endif
 
+.if defined(NOPORTDOCS)
+PYDISTUTILS_INSTALLARGS+=	--no-install-docs
+.else
+PORTDOCS=	*
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e "1s|^.*|#!${PYTHON_CMD}|" ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e "1s|^.*|#!${PYTHON_CMD}|" ${WRKSRC}/src/svn-mailer
 
-post-install:
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC}/docs; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/mail/svnmailer/distinfo b/mail/svnmailer/distinfo
index e5e678490006..8aecaf869718 100644
--- a/mail/svnmailer/distinfo
+++ b/mail/svnmailer/distinfo
@@ -1,3 +1,3 @@
-MD5 (svnmailer-1.0.8.tar.gz) = f1525dfb14187422de23e30c92b54518
-SHA256 (svnmailer-1.0.8.tar.gz) = b81060c79de497a8f00465f8cd6660aaf6bb3c058d0658320c7a9e67bf7b3dd7
-SIZE (svnmailer-1.0.8.tar.gz) = 402491
+MD5 (svnmailer-1.1.0-dev-r1373.tar.bz2) = 6000fa91105eeca33ae588538fde263f
+SHA256 (svnmailer-1.1.0-dev-r1373.tar.bz2) = 00d3b84c62e608b18eabd367f821788a521f05a52ffdd2ea72e7c9eadb3cb302
+SIZE (svnmailer-1.1.0-dev-r1373.tar.bz2) = 300178
diff --git a/mail/svnmailer/files/patch-setup.py b/mail/svnmailer/files/patch-setup.py
new file mode 100644
index 000000000000..91c6ffadf2fb
--- /dev/null
+++ b/mail/svnmailer/files/patch-setup.py
@@ -0,0 +1,59 @@
+--- setup.py.orig	2005-09-25 22:47:47.000000000 +0400
++++ setup.py	2008-06-07 21:40:11.000000000 +0400
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/local/bin/python2.5
+ # -*- coding: utf-8 -*-
+ import os, sys
+ 
+@@ -157,7 +157,7 @@
+             moredocs.include_pattern(convre(r"docs/[^/]+"), is_regex = 1)
+             moredocs.exclude_pattern(convre(r"docs/[^/]+.\d"), is_regex = 1)
+             docs.extend(moredocs.files)
+-            base = 'doc/svnmailer'
++            base = 'share/doc/svnmailer'
+             self.data_files.append((base, docs))
+ 
+             rre = re.escape('/') == '\\/'
+@@ -171,15 +171,15 @@
+                 apidocs.include_pattern(
+                     convre('%s/[^/]+' % repath), is_regex = 1
+                 )
+-                base = 'doc/svnmailer/%s'% path
++                base = 'share/doc/svnmailer/%s'% path
+                 self.data_files.append((base, apidocs.files))
+ 
+             samples = fixfiles(SAMPLES)
+-            base = 'doc/svnmailer/sample'
++            base = 'share/doc/svnmailer/sample'
+             self.data_files.append((base, samples))
+ 
+             hooks = HOOKS
+-            base = 'doc/svnmailer/sample/hooks'
++            base = 'share/doc/svnmailer/sample/hooks'
+             if win32:
+                 hooks = ["%s.bat" % hook for hook in hooks]
+                 scriptsdefault = "C:\\path\\to"
+@@ -191,17 +191,17 @@
+             })
+             self.data_files.append((base, hooks))
+ 
++            # so late, because some files need to be touched in the tree
++            # anyway
++            if store.get('no-install-docs', False):
++                self.data_files = []
++
+             # man pages only on *x
+             if not win32:
+                 for section, pages in MAN.items():
+                     fixfiles(pages)
+                     self.data_files.append(("man/man%s" % section, pages))
+ 
+-            # so late, because some files need to be touched in the tree
+-            # anyway
+-            if store.get('no-install-docs', False):
+-                self.data_files = []
+-
+ 
+     core.setup(
+         name = "svnmailer",
diff --git a/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py b/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py
index c0284187fa6a..f74a54cf159b 100644
--- a/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py
+++ b/mail/svnmailer/files/py25-src-lib-svnmailer-notifier-_base.py
@@ -1,40 +1,40 @@
---- src/lib/svnmailer/notifier/_base.py.orig	Mon Apr 17 14:29:06 2006
-+++ src/lib/svnmailer/notifier/_base.py	Mon Oct  8 15:36:25 2007
-@@ -345,7 +345,6 @@
-             @return: The two encodings
-             @rtype: C{tuple} of C{str}
+--- 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():
-@@ -353,7 +352,7 @@
+@@ -384,7 +383,7 @@
                  enc1 = self._getContentEncoding(
                      change.getBasePath(), change.getBaseRevision()
                  )
 -            except exceptions.LookupError:
 +            except LookupError:
-                 # fall back
+                 """ fall back """
                  pass
  
-@@ -364,7 +363,7 @@
+@@ -395,7 +394,7 @@
                  enc2 = self._getContentEncoding(
                      change.path, change.revision
                  )
 -            except exceptions.LookupError:
 +            except LookupError:
-                 # fall back
+                 """ fall back """
                  pass
  
-@@ -389,7 +388,6 @@
-             @exception encodings.exception.LookupError: The specified encoding
-                 is not implemented or no encoding was specified
+@@ -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)
-@@ -427,7 +425,7 @@
+@@ -461,7 +459,7 @@
              codecs.lookup(enc)
              return enc
  
diff --git a/mail/svnmailer/pkg-plist b/mail/svnmailer/pkg-plist
index 7deeaa410d25..59757bd38a9d 100644
--- a/mail/svnmailer/pkg-plist
+++ b/mail/svnmailer/pkg-plist
@@ -2,15 +2,33 @@ bin/svn-mailer
 %%PYTHON_SITELIBDIR%%/svnmailer/__init__.py
 %%PYTHON_SITELIBDIR%%/svnmailer/__init__.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/__init__.pyo
-%%PYTHON_SITELIBDIR%%/svnmailer/browser.py
-%%PYTHON_SITELIBDIR%%/svnmailer/browser.pyc
-%%PYTHON_SITELIBDIR%%/svnmailer/browser.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/__init__.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/_base.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/_base.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/_base.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/chora.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/chora.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/chora.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/generic.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/generic.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/generic.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/svnweb.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/svnweb.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/svnweb.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/trac.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/trac.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/trac.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/viewcvs.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/viewcvs.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/viewcvs.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/websvn.py
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/websvn.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/browser/websvn.pyo
 %%PYTHON_SITELIBDIR%%/svnmailer/cli.py
 %%PYTHON_SITELIBDIR%%/svnmailer/cli.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/cli.pyo
-%%PYTHON_SITELIBDIR%%/svnmailer/config.py
-%%PYTHON_SITELIBDIR%%/svnmailer/config.pyc
-%%PYTHON_SITELIBDIR%%/svnmailer/config.pyo
 %%PYTHON_SITELIBDIR%%/svnmailer/differ.py
 %%PYTHON_SITELIBDIR%%/svnmailer/differ.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/differ.pyo
@@ -53,23 +71,40 @@ bin/svn-mailer
 %%PYTHON_SITELIBDIR%%/svnmailer/notifier/stdout.py
 %%PYTHON_SITELIBDIR%%/svnmailer/notifier/stdout.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/notifier/stdout.pyo
-%%PYTHON_SITELIBDIR%%/svnmailer/settings.py
-%%PYTHON_SITELIBDIR%%/svnmailer/settings.pyc
-%%PYTHON_SITELIBDIR%%/svnmailer/settings.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/__init__.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/__init__.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_typedstruct.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/__init__.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_accessors.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_accessors.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_accessors.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_base.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_base.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_base.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_fileparser.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_fileparser.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_fileparser.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_typedstruct.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/_typedstruct.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/configfile.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/configfile.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/configfile.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/mappers.py
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/mappers.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/settings/mappers.pyo
+%%PYTHON_SITELIBDIR%%/svnmailer/processes.py
+%%PYTHON_SITELIBDIR%%/svnmailer/processes.pyc
+%%PYTHON_SITELIBDIR%%/svnmailer/processes.pyo
 %%PYTHON_SITELIBDIR%%/svnmailer/stream.py
 %%PYTHON_SITELIBDIR%%/svnmailer/stream.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/stream.pyo
-%%PYTHON_SITELIBDIR%%/svnmailer/struct_accessors.py
-%%PYTHON_SITELIBDIR%%/svnmailer/struct_accessors.pyc
-%%PYTHON_SITELIBDIR%%/svnmailer/struct_accessors.pyo
 %%PYTHON_SITELIBDIR%%/svnmailer/subversion.py
 %%PYTHON_SITELIBDIR%%/svnmailer/subversion.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/subversion.pyo
-%%PYTHON_SITELIBDIR%%/svnmailer/typedstruct.py
-%%PYTHON_SITELIBDIR%%/svnmailer/typedstruct.pyc
-%%PYTHON_SITELIBDIR%%/svnmailer/typedstruct.pyo
 %%PYTHON_SITELIBDIR%%/svnmailer/util.py
 %%PYTHON_SITELIBDIR%%/svnmailer/util.pyc
 %%PYTHON_SITELIBDIR%%/svnmailer/util.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/svnmailer/browser
 @dirrm %%PYTHON_SITELIBDIR%%/svnmailer/notifier
+@dirrm %%PYTHON_SITELIBDIR%%/svnmailer/settings
 @dirrm %%PYTHON_SITELIBDIR%%/svnmailer