Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Apr 2019 08:48:03 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r498876 - in head/mail/archivemail: . files
Message-ID:  <201904140848.x3E8m36V030264@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Sun Apr 14 08:48:02 2019
New Revision: 498876
URL: https://svnweb.freebsd.org/changeset/ports/498876

Log:
  mail/archivemail: Limit to Python 2.7, level up port compliance
  
  archivemail fails to build with Python 3.x [1]:
  
      print too_old_error
                        ^
  SyntaxError: Missing parentheses in call to 'print'. Did you mean print(too_old_error)?
  
  Limit to Python 2.7 accordingly.
  
  While I'm here, level up port compliance:
  
    - Update COMMENT to match setup.py:description
    - Use distutils/autoplist/concurrent (package uses a setup.py). Remove
      NO_BUILD, do-install target, amend pkg-plist accordingly.
    - Patch setup.py to install man pages in /usr/local not /usr/local/share
    - Add test target to assist QA
  
  PR:		237179 [1]
  Reported by:	Helge Oldach <freebsd oldach net> [1]
  MFH:		2019Q2

Added:
  head/mail/archivemail/files/
  head/mail/archivemail/files/patch-setup.py   (contents, props changed)
Modified:
  head/mail/archivemail/Makefile
  head/mail/archivemail/pkg-plist

Modified: head/mail/archivemail/Makefile
==============================================================================
--- head/mail/archivemail/Makefile	Sun Apr 14 08:33:48 2019	(r498875)
+++ head/mail/archivemail/Makefile	Sun Apr 14 08:48:02 2019	(r498876)
@@ -3,30 +3,29 @@
 
 PORTNAME=	archivemail
 PORTVERSION=	0.9.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/${PORTNAME}/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Archive or delete mail older than N days
+COMMENT=	Archive and compress old email
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		python shebangfix
-NO_BUILD=	yes
-NO_ARCH=	yes
-SHEBANG_FILES=	archivemail  \
-		test_archivemail
+USES=		python:2.7 shebangfix
 
+USE_PYTHON=	distutils concurrent autoplist
+
+SHEBANG_FILES=	test_archivemail
+
 DOCS=		CHANGELOG FAQ NEWS README TODO
 EXAMPLES=	test_archivemail examples/archivemail_all
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/archivemail ${STAGEDIR}${PREFIX}/bin/archivemail
-	${INSTALL_MAN} ${WRKSRC}/archivemail.1 ${STAGEDIR}${MANPREFIX}/man/man1
+NO_ARCH=	yes
 
 do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
@@ -35,5 +34,8 @@ do-install-EXAMPLES-on:
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
+
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} test_archivemail
 
 .include <bsd.port.mk>

Added: head/mail/archivemail/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/archivemail/files/patch-setup.py	Sun Apr 14 08:48:02 2019	(r498876)
@@ -0,0 +1,9 @@
+--- setup.py.orig	2019-04-14 08:03:17 UTC
++++ setup.py
+@@ -29,5 +29,5 @@ setup(name="archivemail",
+       maintainer="Nikolaus Schulz, Peter Poeml",
+       maintainer_email="nikosch@users.sourceforge.net, poeml@users.sourceforge.net",
+       scripts=["archivemail"],
+-      data_files=[("share/man/man1", ["archivemail.1"])],
++      data_files=[("man/man1", ["archivemail.1"])],
+       )

Modified: head/mail/archivemail/pkg-plist
==============================================================================
--- head/mail/archivemail/pkg-plist	Sun Apr 14 08:33:48 2019	(r498875)
+++ head/mail/archivemail/pkg-plist	Sun Apr 14 08:48:02 2019	(r498876)
@@ -1,5 +1,3 @@
-bin/archivemail
-man/man1/archivemail.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/NEWS



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904140848.x3E8m36V030264>