Index: configure
--- configure.orig	2017-11-07 01:46:52.000000000 +0100
+++ configure	2017-12-27 10:23:46.698956000 +0100
@@ -5671,7 +5671,7 @@
 See \`config.log' for more details" "$LINENO" 5; }
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
-	ICU_LIBS=$pkg_cv_ICU_LIBS
+	ICU_LIBS="$pkg_cv_ICU_LIBS -lstdc++"
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
@@ -7852,12 +7852,6 @@
 test "$PORTNAME" = "win32" && perl_useshrplib=`echo $perl_useshrplib | sed 's,\\\\,/,g'`
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $perl_useshrplib" >&5
 $as_echo "$perl_useshrplib" >&6; }
-  if test "$perl_useshrplib" != yes && test "$perl_useshrplib" != true; then
-    as_fn_error $? "cannot build PL/Perl because libperl is not a shared library
-You might have to rebuild your Perl installation.  Refer to the
-documentation for details.  Use --without-perl to disable building
-PL/Perl." "$LINENO" 5
-  fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLAGS recommended by Perl" >&5
 $as_echo_n "checking for CFLAGS recommended by Perl... " >&6; }
@@ -8069,12 +8063,6 @@
 		done
 	fi
 fi
-if test "$found_shlib" != 1; then
-	as_fn_error $? "could not find shared library for Python
-You might have to rebuild your Python installation.  Refer to the
-documentation for details.  Use --without-python to disable building
-PL/Python." "$LINENO" 5
-fi
 python_libspec="-L${python_libdir} -l${ldlibrary}"
 
 python_additional_libs=`${PYTHON} -c "import distutils.sysconfig; print(' '.join(filter(None,distutils.sysconfig.get_config_vars('LIBS','LIBC','LIBM','BASEMODLIBS'))))"`
Index: src/Makefile.shlib
--- src/Makefile.shlib.orig	2017-11-07 01:46:52.000000000 +0100
+++ src/Makefile.shlib	2017-12-16 18:21:53.915186000 +0100
@@ -259,7 +259,7 @@
 
 .PHONY: all-lib all-static-lib all-shared-lib
 
-all-lib: all-shared-lib
+all-lib:
 ifdef soname
 # no static library when building a dynamically loadable module
 all-lib: all-static-lib
Index: src/backend/Makefile
--- src/backend/Makefile.orig	2017-11-07 01:46:52.000000000 +0100
+++ src/backend/Makefile	2017-12-16 18:21:53.915346000 +0100
@@ -43,7 +43,7 @@
 LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS)) $(LDAP_LIBS_BE) $(ICU_LIBS)
 
 # The backend doesn't need everything that's in LIBS, however
-LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
+LIBS := $(filter-out -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
 
 ifeq ($(with_systemd),yes)
 LIBS += -lsystemd
Index: src/include/port.h
--- src/include/port.h.orig	2017-11-07 01:46:52.000000000 +0100
+++ src/include/port.h	2017-12-16 18:21:53.915512000 +0100
@@ -380,7 +380,7 @@
 extern int	getpeereid(int sock, uid_t *uid, gid_t *gid);
 #endif
 
-#ifndef HAVE_ISINF
+#if !defined(HAVE_ISINF) && !defined(__FreeBSD__)
 extern int	isinf(double x);
 #endif
 
Index: src/makefiles/Makefile.freebsd
--- src/makefiles/Makefile.freebsd.orig	2017-11-07 01:46:52.000000000 +0100
+++ src/makefiles/Makefile.freebsd	2017-12-16 18:21:53.915639000 +0100
@@ -13,7 +13,7 @@
 # Rule for building a shared library from a single .o file
 %.so: %.o
 ifdef ELF_SYSTEM
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK)
 else
 	$(LD) $(LDREL) $(LDOUT) $<.obj -x $<
 	@echo building shared object $@
Index: src/makefiles/Makefile.linux
--- src/makefiles/Makefile.linux.orig	2017-11-07 01:46:52.000000000 +0100
+++ src/makefiles/Makefile.linux	2017-12-16 18:21:53.915754000 +0100
@@ -12,4 +12,4 @@
 
 # Rule for building a shared library from a single .o file
 %.so: %.o
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $<
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@ $< $(SHLIB_LINK)