Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jan 2021 16:06:29 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r560534 - in head/science/lamprop: . files
Message-ID:  <202101061606.106G6TCM055853@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Wed Jan  6 16:06:28 2021
New Revision: 560534
URL: https://svnweb.freebsd.org/changeset/ports/560534

Log:
  science/lamprop:
  - Update to 2020.12.28
  - The port does not install Python modules, therefore remove PKGNAMEPREFIX
  
  PR:		252287
  Submitted by:	(maintainer)

Added:
  head/science/lamprop/files/
  head/science/lamprop/files/patch-setup.py   (contents, props changed)
Modified:
  head/science/lamprop/Makefile
  head/science/lamprop/distinfo

Modified: head/science/lamprop/Makefile
==============================================================================
--- head/science/lamprop/Makefile	Wed Jan  6 16:06:26 2021	(r560533)
+++ head/science/lamprop/Makefile	Wed Jan  6 16:06:28 2021	(r560534)
@@ -1,32 +1,42 @@
 # $FreeBSD$
 
 PORTNAME=	lamprop
-PORTVERSION=	3.8
-PORTREVISION=	1
+PORTVERSION=	2020.12.28
 CATEGORIES=	science python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	rsmith@xs4all.nl
 COMMENT=	Calculates properties of fiber reinforced composites
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	${PYNUMPY}
-RUN_DEPENDS=	${PYNUMPY}
-
-USES=		python:3.6+
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python:3.6+ shebangfix
+SHEBANG_FILES=	setup.py
 USE_GITHUB=	yes
 GH_ACCOUNT=	rsmith-nl
 
 NO_ARCH=	yes
 
-PORTDOCS=	lamprop-manual.pdf
+PORTDOCS=	lamprop-manual.pdf README.rst
+PLIST_FILES=	bin/lamprop
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS GUI
 
-post-install-DOCS-on:
+GUI_DESC=		Tkinter GUI for lamprop
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR}
+GUI_PLIST_FILES=	bin/lamprop-gui
+
+do-build:
+	cd ${WRKSRC} && ${PYTHON_CMD} setup.py
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/lamprop ${STAGEDIR}${PREFIX}/bin
+
+do-install-GUI-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/lamprop-gui ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/lamprop-manual.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.rst ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/science/lamprop/distinfo
==============================================================================
--- head/science/lamprop/distinfo	Wed Jan  6 16:06:26 2021	(r560533)
+++ head/science/lamprop/distinfo	Wed Jan  6 16:06:28 2021	(r560534)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513686957
-SHA256 (rsmith-nl-lamprop-3.8_GH0.tar.gz) = 486baf72e0b94f27a31926611a155da6df26cd04a79517d53480083be5da574f
-SIZE (rsmith-nl-lamprop-3.8_GH0.tar.gz) = 221538
+TIMESTAMP = 1609245369
+SHA256 (rsmith-nl-lamprop-2020.12.28_GH0.tar.gz) = 5d59b0ebc5547b7be1b68b2405a9a5d170f927fed6dff4e34e5559b72614d2a4
+SIZE (rsmith-nl-lamprop-2020.12.28_GH0.tar.gz) = 7479043

Added: head/science/lamprop/files/patch-setup.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/lamprop/files/patch-setup.py	Wed Jan  6 16:06:28 2021	(r560534)
@@ -0,0 +1,12 @@
+--- setup.py.orig	2020-12-29 15:45:52 UTC
++++ setup.py
+@@ -81,7 +81,8 @@ def mkarchive(name, modules, main="__main__.py"):
+         main: Name of the main file. Defaults to __main__.py
+     """
+     std = "__main__.py"
+-    shebang = b"#!/usr/bin/env python\n"
++    with open(sys.argv[0], "rb") as f:
++        shebang = f.readline()
+     if isinstance(modules, str):
+         modules = [modules]
+     if main != std:



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