<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7fe9262a5f6e20e23b051072195c5c6998a5eb93">https://github.com/macports/macports-ports/commit/7fe9262a5f6e20e23b051072195c5c6998a5eb93</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7fe9262a5f6 pgpointcloud: respect CXX configuration variable
</span>7fe9262a5f6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7fe9262a5f6e20e23b051072195c5c6998a5eb93
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Sat Nov 18 09:46:19 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> pgpointcloud: respect CXX configuration variable
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/68723
</span>---
databases/pgpointcloud/Portfile | 5 ++--
.../pgpointcloud/files/01-patch-xml2-config.diff | 13 ++++++++++
.../pgpointcloud/files/02-patch-cunit-conf.diff | 13 ++++++++++
databases/pgpointcloud/files/03-patch-cxx.diff | 28 ++++++++++++++++++++++
.../pgpointcloud/files/patch-config-mk-in.diff | 10 --------
.../pgpointcloud/files/patch-configure-ac.diff | 24 -------------------
6 files changed, 57 insertions(+), 36 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgpointcloud/Portfile b/databases/pgpointcloud/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c4712108a7d..b352e150f8d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/pgpointcloud/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/pgpointcloud/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,8 +21,9 @@ checksums rmd160 54e0784994a458e9591ea416caf7ae106c0d7007 \
</span> sha256 f3924f283345f2da46a971e65f0c6ce602640ecf88a2057293443ec2a7a56774 \
size 348678
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-config-mk-in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure-ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles 01-patch-xml2-config.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 02-patch-cunit-conf.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 03-patch-cxx.diff
</span>
configure.cmd autoupdate && ./autogen.sh && ./configure
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgpointcloud/files/01-patch-xml2-config.diff b/databases/pgpointcloud/files/01-patch-xml2-config.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3934a023845
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/pgpointcloud/files/01-patch-xml2-config.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Only link to libxml2, addresses https://trac.macports.org/ticket/68704
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -281,7 +281,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Extract the linker and include flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XML2_LDFLAGS=`$XML2CONFIG --libs`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XML2_LDFLAGS=`$XML2CONFIG --libs --dynamic`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XML2_CPPFLAGS=`$XML2CONFIG --cflags`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Extract the version
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgpointcloud/files/02-patch-cunit-conf.diff b/databases/pgpointcloud/files/02-patch-cunit-conf.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a460f40caa3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/pgpointcloud/files/02-patch-cunit-conf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Honor '--without-cunit', submitted upstreams with https://github.com/pgpointcloud/pointcloud/pull/349
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS="${CPPFLAGS_SAVE}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "$FOUND_CUNIT" = "YES"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if test "$FOUND_CUNIT" = "YES" && test x${with_cunit} != "xno"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_DEFINE([HAVE_CUNIT], [1], [Have CUnit])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CUNIT_STATUS="enabled"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $CUNITDIR; then
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgpointcloud/files/03-patch-cxx.diff b/databases/pgpointcloud/files/03-patch-cxx.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..abb1342f302
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/pgpointcloud/files/03-patch-cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Respect CXX configuration variable, fixes https://trac.macports.org/ticket/68723,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+submitted upstreams: https://github.com/pgpointcloud/pointcloud/pull/350
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- config.mk.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ config.mk.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC = @CC@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXXFLAGS += -fPIC -std=c++0x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX = @CXX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += @CFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXXFLAGS += -fPIC -std=c++11 @CXXFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SQLPP = @SQLPP@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XML2_CPPFLAGS = @XML2_CPPFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -377,6 +377,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([ -------------- Compiler Info ------------- ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([ C compiler: ${CC} ${CFLAGS}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_MSG_RESULT([ CXX compiler: ${CXX} ${CXXFLAGS}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([ SQL preprocessor: ${SQLPP}])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_RESULT([ -------------- Dependencies -------------- ])
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgpointcloud/files/patch-config-mk-in.diff b/databases/pgpointcloud/files/patch-config-mk-in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 631238a8776..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/pgpointcloud/files/patch-config-mk-in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config.mk.in.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config.mk.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC = @CC@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS = @CFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXXFLAGS += -fPIC -std=c++0x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXXFLAGS += -fPIC -std=gnu++11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SQLPP = @SQLPP@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XML2_CPPFLAGS = @XML2_CPPFLAGS@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/pgpointcloud/files/patch-configure-ac.diff b/databases/pgpointcloud/files/patch-configure-ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3dd3fc0a81..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/pgpointcloud/files/patch-configure-ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Honor '--without-cunit', addressed upstreams with https://github.com/pgpointcloud/pointcloud/pull/349
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Only link to libxml2, addresses https://trac.macports.org/ticket/68704
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,7 +138,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="${CPPFLAGS_SAVE}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if test "$FOUND_CUNIT" = "YES"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "$FOUND_CUNIT" = "YES" && test x${with_cunit} != "xno"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_DEFINE([HAVE_CUNIT], [1], [Have CUnit])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CUNIT_STATUS="enabled"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $CUNITDIR; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -281,7 +281,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Extract the linker and include flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--XML2_LDFLAGS=`$XML2CONFIG --libs`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+XML2_LDFLAGS=`$XML2CONFIG --libs --dynamic`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- XML2_CPPFLAGS=`$XML2CONFIG --cflags`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Extract the version
</span></pre><pre style='margin:0'>
</pre>