From 71cd61e3a6d8567124daf22a45c2f90e82711671 Mon Sep 17 00:00:00 2001
From: John Vogel <jvogel4@stny.rr.com>
Date: Tue, 14 Apr 2020 11:57:01 -0400
Subject: [PATCH] serf: adjust to scons built with python3

---
 serf/.signature      |  5 +++--
 serf/Pkgfile         | 19 +++++++++++++------
 serf/scons-py3.patch | 24 ++++++++++++++++++++++++
 3 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 serf/scons-py3.patch

diff --git a/serf/.signature b/serf/.signature
index 333b8f80e..bf32553ef 100644
--- a/serf/.signature
+++ b/serf/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zoYJo+VIUqB5sjREGpjksiOPHZVCPzfN5DG+wm0F2T8Ry4Je8e+HLSkPgHznM3/e48e/MEscEYR+BBqJXNsfwU=
-SHA256 (Pkgfile) = 249461693e099c9c5967d9a81c9c3b9c9b8f320210cbbb0380f2098383be3118
+RWSagIOpLGJF38S5I9LDuE9JBtIqB+kdFJSHWJv6HLfFQ3KhQ/iBSAwABSnEUnj6gINk1QNCkCbqZhpcj3jTeO8USLN3S8g7TgU=
+SHA256 (Pkgfile) = bc3572d18e93b0db55bacd017fb6d66073bb9c1fdbfb802d860360e6712f7178
 SHA256 (.footprint) = e226405dcc3a029e645718b827ec06544ae6757ad6c6c881e381acb2868a0ac4
 SHA256 (serf-1.3.9.tar.bz2) = 549c2d21c577a8a9c0450facb5cca809f26591f048e466552240947bdf7a87cc
+SHA256 (scons-py3.patch) = 363732546098b4c9415eb5d38b595d04c660c6324a34159768d334507b7d241f
diff --git a/serf/Pkgfile b/serf/Pkgfile
index f22711e5e..66067ae30 100644
--- a/serf/Pkgfile
+++ b/serf/Pkgfile
@@ -6,21 +6,28 @@
 
 name=serf
 version=1.3.9
-release=1
-source=(https://archive.apache.org/dist/$name/$name-$version.tar.bz2)
+release=2
+source=(https://archive.apache.org/dist/$name/$name-$version.tar.bz2
+        scons-py3.patch)
 
 build() {
     cd $name-$version
 
+    # Adjust to scons built with python3
+	# (should go away if/when python3 becomes default python)
+    patch -Np1 -i $SRC/scons-py3.patch
+    ln -s /usr/bin/python3 python
+    export PATH=$SRC/$name-$version:$PATH
+
     # removes runtime path from shared library
-    sed '/Append/ s/RPATH=libdir,//' -i SConstruct
+    sed -i -e '/Append/ s/RPATH=libdir,//' SConstruct
     # disable building and installing of the static library
-    sed '/Default/ s/lib_static,//' -i SConstruct
-    sed '/Alias/ s/install_static,//' -i SConstruct
+    sed -i -e '/Default/ s/lib_static,//' SConstruct
+    sed -i -e '/Alias/ s/install_static,//' SConstruct
 
     scons PREFIX=/usr LIBDIR=/usr/lib
     scons install --install-sandbox=$PKG
 
-    # serf-1.3.9 do not install world writable files
+    # serf-1.3.9 does not install world writable files
     chmod -cR go-w $PKG/usr/include/serf-1
 }
diff --git a/serf/scons-py3.patch b/serf/scons-py3.patch
new file mode 100644
index 000000000..144f5e39e
--- /dev/null
+++ b/serf/scons-py3.patch
@@ -0,0 +1,24 @@
+--- serf-1.3.9/SConstruct.orig	2019-07-26 17:49:30.910189251 +0000
++++ serf-1.3.9/SConstruct	2019-07-26 17:49:54.073821735 +0000
+@@ -163,9 +163,9 @@
+               suffix='.def', src_suffix='.h')
+   })
+ 
+-match = re.search('SERF_MAJOR_VERSION ([0-9]+).*'
+-                  'SERF_MINOR_VERSION ([0-9]+).*'
+-                  'SERF_PATCH_VERSION ([0-9]+)',
++match = re.search(b'SERF_MAJOR_VERSION ([0-9]+).*'
++                  b'SERF_MINOR_VERSION ([0-9]+).*'
++                  b'SERF_PATCH_VERSION ([0-9]+)',
+                   env.File('serf.h').get_contents(),
+                   re.DOTALL)
+ MAJOR, MINOR, PATCH = [int(x) for x in match.groups()]
+@@ -183,7 +183,7 @@
+ 
+ unknown = opts.UnknownVariables()
+ if unknown:
+-  print 'Warning: Used unknown variables:', ', '.join(unknown.keys())
++  print ('Warning: Used unknown variables:', ', '.join(unknown.keys()))
+ 
+ apr = str(env['APR'])
+ apu = str(env['APU'])