Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Jun 2023 21:08:18 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 4bb09c68982f - main - graphics/py-ming: Convert REINPLACE_CMD to patch file
Message-ID:  <202306052108.355L8IT9084615@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4bb09c68982fc6c2289a0425c16012ea37f8fddd

commit 4bb09c68982fc6c2289a0425c16012ea37f8fddd
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2023-06-05 21:06:31 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2023-06-05 21:07:50 +0000

    graphics/py-ming: Convert REINPLACE_CMD to patch file
---
 graphics/py-ming/Makefile                       |  3 +--
 graphics/py-ming/files/patch-py_ext-Makefile.am | 11 +++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 9e7b634cca09..04213334b419 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -37,12 +37,11 @@ PORTSCOUT=	limit:^ming-
 
 .include <bsd.port.pre.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+.if ${OPSYS} == FreeBSD && ((${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000) || ${OSVERSION} >= 1400079)
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's| --root ".*"||' ${WRKSRC}/py_ext/Makefile.am
 	@${REINPLACE_CMD} -e 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/py_ext/setup.py.in
 	@${LN} -fs ${LOCALBASE}/include/ming ${WRKSRC}/src
 
diff --git a/graphics/py-ming/files/patch-py_ext-Makefile.am b/graphics/py-ming/files/patch-py_ext-Makefile.am
new file mode 100644
index 000000000000..c1e149f4c132
--- /dev/null
+++ b/graphics/py-ming/files/patch-py_ext-Makefile.am
@@ -0,0 +1,11 @@
+--- py_ext/Makefile.am.orig	2017-04-07 08:12:56 UTC
++++ py_ext/Makefile.am
+@@ -18,7 +18,7 @@ clean-local:
+ 	rm -Rf test.swf build
+ 
+ install:
+-	$(PYTHON) setup.py install --prefix $(prefix) --root "/$(DESTDIR)"
++	$(PYTHON) setup.py install --prefix $(prefix)
+ 
+ test.swf:
+ 	$(PYTHON) shape.py



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