Attachment 144626 Details for Bug 191103 – Updated patch to fix plist orphans.

[patch] Updated patch to fix plist orphans.

stltools.patch (text/plain), 5.35 KB, created by rsmith on 2014-07-12 22:48:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rsmith

Created: 2014-07-12 22:48:09 UTC

Size: 5.35 KB

patch

obsolete

>diff -ruN py-stl/Makefile stltools/Makefile
>--- py-stl/Makefile	2014-04-10 23:34:26.000000000 +0200
>+++ stltools/Makefile	2014-06-15 23:07:02.000000000 +0200
>@@ -1,56 +1,44 @@
>-# Created by: Roland Smith <rsmith@xs4all.nl>
>-# $FreeBSD: head/graphics/py-stl/Makefile 347760 2014-03-10 14:49:26Z bapt $
>+# Created by: R.F. Smith <rsmith@xs4all.nl>
>+# $FreeBSD$
> 
>-PORTNAME=		stl
>-PORTVERSION=		3.1
>+PORTNAME=		stltools
>+PORTVERSION=		3.2
> CATEGORIES=		graphics python
>-MASTER_SITES=		http://rsmith.home.xs4all.nl/software/
>+MASTER_SITES=		http://rsmith.home.xs4all.nl/files/
> PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
>-DISTNAME=		py-${PORTNAME}-${PORTVERSION}
> 
> MAINTAINER=		rsmith@xs4all.nl
> COMMENT=		Converts STL models to POV-Ray meshes or PostScript/PDF images
> 
>-LICENSE=		BSD
>+LICENSE=		BSD2CLAUSE
> 
>-# bypass infrastructure bug
>-OPTIONSFILE=		${PORT_DBDIR}/py-${PORTNAME}/options
>+RUN_DEPENDS=		${PYNUMPY}
> 
>-USES=		zip
>-USE_PYTHON=		yes
>+USES=			zip
>+USE_PYTHON=		YES
>+PYTHON_VERSION=		python2.7
> USE_PYDISTUTILS=	YES
>-PYDISTUTILS_EGGINFO=	py_stl-${PORTVERSION}-py${PYTHON_VER}.egg-info
> 
>-CONFLICTS=		stl2pov-[0-9]*
>-
>-MAN1=			stl2ps.1 stlinfo.1 stl2pov.1
>+DOCS=			README.txt
>+EXAMPLES=		test/cube.stl test/cube_bin.stl
> 
> OPTIONS_DEFINE=		PYCAIRO
>-PYCAIRO_DESC=		Use (py)Cairo to enable stl2pdf
>+PYCAIRO_DESC=		Use (py)Cairo to enable stl2pdf to function.
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
>-STL_SCRIPTS=		stl2pov stl2ps stlinfo
>-
> .if ${PORT_OPTIONS:MPYCAIRO}
> RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}cairo>1.8:${PORTSDIR}/graphics/py-cairo
>-MAN1+=			stl2pdf.1
>-PLIST_SUB=		STL2PDF=""
>-STL_SCRIPTS+=		stl2pdf
>-.else
>-PLIST_SUB=		STL2PDF="@comment "
> .endif
> 
>-NO_BUILD=		YES
>-
> post-install:
>-.if empty(PORT_OPTIONS:MPYCAIRO)
>-	@${RM} -f ${PREFIX}/bin/stl2pdf.py
>-.endif
>-.for s in ${STL_SCRIPTS}
>-	${INSTALL_MAN} ${WRKSRC}/${s}.1 ${MANPREFIX}/man/man1
>-	@${MV} ${PREFIX}/bin/${s}.py  ${PREFIX}/bin/${s}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+.for i in ${DOCS}
>+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
>+.endfor
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+.for i in ${EXAMPLES}
>+	@${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${EXAMPLESDIR}
> .endfor
> 
> .include <bsd.port.mk>
>diff -ruN py-stl/distinfo stltools/distinfo
>--- py-stl/distinfo	2014-04-10 23:34:27.000000000 +0200
>+++ stltools/distinfo	2014-06-16 00:14:35.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (py-stl-3.1.zip) = d5a2eccbd627d05b28d3b6d619202d3a55b4d94dbf21a63b68109688ebc8e929
>-SIZE (py-stl-3.1.zip) = 115488
>+SHA256 (stltools-3.2.zip) = 535322dd2b48f7d21c149f230aa8fffecbd15707958b0ee67438737dd73c0105
>+SIZE (stltools-3.2.zip) = 24266
>diff -ruN py-stl/pkg-descr stltools/pkg-descr
>--- py-stl/pkg-descr	2014-05-22 19:57:45.000000000 +0200
>+++ stltools/pkg-descr	2014-06-10 23:18:04.000000000 +0200
>@@ -1,11 +1,11 @@
>-The python modules stl.py and xform.py are for reading, creating and
>-transforming STL (STereoLithography) files. These modules are used by the
>-following scripts:
>+The modules in the stltools package can read and write STL files, perform 3D
>+coordinate transforms and projections. These modules are used by the following
>+provided scripts;
> 
> stl2pov: Converts the STL model to a mesh usable with the POV-ray raytracer.
> stl2ps:  Creates a view of the STL model in scalable PostScript.
>-stl2pdf: Creates a view of the STL model as a PDF. Requires graphics/py-cairo
>-sltinfo: Either displays some information about a STL file or prints it in
>-text format.
>+stl2pdf: Creates a view of the STL model as a PDF. Requires graphics/py-cairo.
>+stlinfo: Either displays some information about a STL file or prints it in
>+         text format.
> 
> WWW: http://rsmith.home.xs4all.nl/software/py-stl-stl2pov.html
>diff -ruN py-stl/pkg-plist stltools/pkg-plist
>--- py-stl/pkg-plist	2014-04-10 23:34:26.000000000 +0200
>+++ stltools/pkg-plist	2014-07-13 00:41:10.000000000 +0200
>@@ -1,10 +1,33 @@
>-%%PYTHON_SITELIBDIR%%/stl.py
>-%%PYTHON_SITELIBDIR%%/stl.pyc
>-%%PYTHON_SITELIBDIR%%/stl.pyo
>-%%PYTHON_SITELIBDIR%%/xform.py
>-%%PYTHON_SITELIBDIR%%/xform.pyc
>-%%PYTHON_SITELIBDIR%%/xform.pyo
>-%%STL2PDF%%bin/stl2pdf
>+bin/stl2pdf
> bin/stl2pov
> bin/stl2ps
> bin/stlinfo
>+%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/PKG-INFO
>+%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/SOURCES.txt
>+%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/dependency_links.txt
>+%%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info/top_level.txt
>+%%PYTHON_SITELIBDIR%%/stltools/__init__.py
>+%%PYTHON_SITELIBDIR%%/stltools/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/stltools/__init__.pyo
>+%%PYTHON_SITELIBDIR%%/stltools/bbox.py
>+%%PYTHON_SITELIBDIR%%/stltools/bbox.pyc
>+%%PYTHON_SITELIBDIR%%/stltools/bbox.pyo
>+%%PYTHON_SITELIBDIR%%/stltools/matrix.py
>+%%PYTHON_SITELIBDIR%%/stltools/matrix.pyc
>+%%PYTHON_SITELIBDIR%%/stltools/matrix.pyo
>+%%PYTHON_SITELIBDIR%%/stltools/stl.py
>+%%PYTHON_SITELIBDIR%%/stltools/stl.pyc
>+%%PYTHON_SITELIBDIR%%/stltools/stl.pyo
>+%%PYTHON_SITELIBDIR%%/stltools/utils.py
>+%%PYTHON_SITELIBDIR%%/stltools/utils.pyc
>+%%PYTHON_SITELIBDIR%%/stltools/utils.pyo
>+%%PYTHON_SITELIBDIR%%/stltools/vecops.py
>+%%PYTHON_SITELIBDIR%%/stltools/vecops.pyc
>+%%PYTHON_SITELIBDIR%%/stltools/vecops.pyo
>+%%PORTDOCS%%%%DOCSDIR%%/README.txt
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube.stl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cube_bin.stl
>+@dirrmtry %%PYTHON_SITELIBDIR%%/stltools
>+@dirrmtry %%PYTHON_SITELIBDIR%%/stltools-3.2-py2.7.egg-info
>+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
>+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%

Actions: View | Diff

Attachments on bug 191103: 143848 | 144626