svn commit: r558495 - in head/graphics/geos: . files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Dec 19 20:06:14 2020
New Revision: 558495
URL: https://svnweb.freebsd.org/changeset/ports/558495

Log:
  Convert REINPLACE_CMD to patch files

Added:
  head/graphics/geos/files/
  head/graphics/geos/files/patch-tests-geostest-Makefile.in   (contents, props changed)
  head/graphics/geos/files/patch-tests-thread-Makefile.in   (contents, props changed)
Modified:
  head/graphics/geos/Makefile

Modified: head/graphics/geos/Makefile
==============================================================================
--- head/graphics/geos/Makefile	Sat Dec 19 20:06:09 2020	(r558494)
+++ head/graphics/geos/Makefile	Sat Dec 19 20:06:14 2020	(r558495)
@@ -22,9 +22,6 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-lstdc++||' ${WRKSRC}/tests/geostest/Makefile.in ${WRKSRC}/tests/thread/Makefile.in
-
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile -exec ${REINPLACE_CMD} -e '/CXXFLAGS = / s| -O2||' {} +
 

Added: head/graphics/geos/files/patch-tests-geostest-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/geos/files/patch-tests-geostest-Makefile.in	Sat Dec 19 20:06:14 2020	(r558495)
@@ -0,0 +1,14 @@
+--- tests/geostest/Makefile.in.orig	2020-03-10 17:55:52 UTC
++++ tests/geostest/Makefile.in
+@@ -364,9 +364,9 @@ EXTRA_DIST = \
+ 	testrunner.sh
+ 
+ 
+-# The -lstdc++ is needed for --disable-shared to work
++# The  is needed for --disable-shared to work
+ geostest_SOURCES = geostest.c
+-geostest_LDADD = $(top_builddir)/capi/libgeos_c.la -lstdc++
++geostest_LDADD = $(top_builddir)/capi/libgeos_c.la
+ all: all-am
+ 
+ .SUFFIXES:

Added: head/graphics/geos/files/patch-tests-thread-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/geos/files/patch-tests-thread-Makefile.in	Sat Dec 19 20:06:14 2020	(r558495)
@@ -0,0 +1,20 @@
+--- tests/thread/Makefile.in.orig	2020-03-10 17:55:52 UTC
++++ tests/thread/Makefile.in
+@@ -362,13 +362,13 @@ top_srcdir = @top_srcdir@
+ #
+ AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+ 
+-# The -lstdc++ is needed for --disable-shared to work
++# The  is needed for --disable-shared to work
+ threadtest_SOURCES = threadtest.c
+-threadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -lstdc++
++threadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread
+ 
+-# The -lstdc++ is needed for --disable-shared to work
++# The  is needed for --disable-shared to work
+ badthreadtest_SOURCES = badthreadtest.c
+-badthreadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread -lstdc++
++badthreadtest_LDADD = $(top_builddir)/capi/libgeos_c.la -lpthread
+ all: all-am
+ 
+ .SUFFIXES: