Index: tools/dev/unix-build/Makefile.svn =================================================================== --- tools/dev/unix-build/Makefile.svn (revision 1872002) +++ tools/dev/unix-build/Makefile.svn (working copy) @@ -105,7 +105,7 @@ PCRE_VER = 8.41 HTTPD_VER = 2.4.37 NEON_VER = 0.30.2 -SERF_VER = 1.3.9 +SERF_VER = 1.4.x SERF_OLD_VER = 0.3.1 CYRUS_SASL_VER = 2.1.25 SQLITE_VER = 3160200 @@ -193,7 +193,7 @@ HTTPD_URL = https://archive.apache.org/dist/httpd/$(HTTPD_DIST) #NEON_URL = http://webdav.org/neon/$(NEON_DIST) NEON_URL = http://ftp.openbsd.org/pub/OpenBSD/distfiles/$(NEON_DIST) -SERF_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_VER) +SERF_URL = https://svn.apache.org/repos/asf/serf/branches/$(SERF_VER) SERF_OLD_URL = https://svn.apache.org/repos/asf/serf/tags/$(SERF_OLD_VER) SQLITE_URL = https://www.sqlite.org/2017/$(SQLITE_DIST) CYRUS_SASL_URL = https://github.com/cyrusimap/cyrus-sasl/releases/download/cyrus-sasl-${CYRUS_SASL_VER}/$(CYRUS_SASL_DIST) @@ -905,7 +905,6 @@ [ -d $(SERF_OBJDIR) ] || mkdir -p $(SERF_OBJDIR) if [ ! -d $(SERF_SRCDIR) ]; then \ svn co $(SERF_URL) $(SERF_SRCDIR); \ - svn merge ^/serf/branches/1.3.x-sslbuild@1781542 $(SERF_SRCDIR); \ fi touch $@