From owner-svn-ports-all@freebsd.org Sat Dec 19 20:06:18 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 15A064CF614; Sat, 19 Dec 2020 20:06:18 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CyxZK0Ht3z4bqb; Sat, 19 Dec 2020 20:06:15 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 194AD22FD3; Sat, 19 Dec 2020 20:06:15 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0BJK6EA9097722; Sat, 19 Dec 2020 20:06:14 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0BJK6Eu6097720; Sat, 19 Dec 2020 20:06:14 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202012192006.0BJK6Eu6097720@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 19 Dec 2020 20:06:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r558495 - in head/graphics/geos: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/graphics/geos: . files X-SVN-Commit-Revision: 558495 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2020 20:06:18 -0000 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: