diff --git a/devel/aws-sdk-cpp/Makefile b/devel/aws-sdk-cpp/Makefile
index 4396d5c722ce..46470d945008 100644
--- a/devel/aws-sdk-cpp/Makefile
+++ b/devel/aws-sdk-cpp/Makefile
@@ -1,59 +1,80 @@
 PORTNAME=	aws-sdk-cpp
-PORTVERSION=	1.8.121
+PORTVERSION=	1.9.129
 CATEGORIES=	devel
 
 MAINTAINER=	danilo@FreeBSD.org
 COMMENT=	C++ interface for Amazon Web Services (AWS)
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv6=		fails to build: runaway process
 BROKEN_armv7=		fails to build: runaway process
 BROKEN_i386=		fails to build: compiler runs out of memory
 BROKEN_powerpc=		fails to build: compiler runs out of memory
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpulse.so:audio/pulseaudio \
 		libaws-c-common.so:devel/aws-c-common \
 		libaws-checksums.so:devel/aws-checksums \
-		libaws-c-event-stream.so:devel/aws-c-event-stream
+		libaws-c-event-stream.so:devel/aws-c-event-stream \
+		libaws-crt-cpp.so:devel/aws-crt-cpp \
+		libaws-c-mqtt.so:devel/aws-c-mqtt \
+		libaws-c-s3.so:devel/aws-c-s3 \
+		libaws-c-auth.so:security/aws-c-auth \
+		libaws-c-http.so:devel/aws-c-http \
+		libaws-c-io.so:devel/aws-c-io \
+		libs2n.so:security/s2n \
+		libaws-c-compression.so:devel/aws-c-compression \
+		libaws-c-cal.so:security/aws-c-cal \
+		libaws-c-sdkutils.so:devel/aws-c-sdkutils \
+		libnghttp2.so:www/libnghttp2 \
+		libssh2.so:security/libssh2 \
+		libdbus-1.so:devel/dbus \
+		libsndfile.so:audio/libsndfile \
+		libFLAC.so:audio/flac \
+		libopus.so:audio/opus \
+		libvorbis.so:audio/libvorbis \
+		libogg.so:audio/libogg
 
-USES=		cmake:noninja localbase:ldflags pkgconfig compiler:c++11-lib ssl
+USES=		cmake:noninja compiler:c++11-lib gettext-runtime localbase:ldflags \
+		pkgconfig ssl xorg
+USE_XORG=	x11 xcb ice sm xtst xau xdmcp xext xi
 
 BUILD_ONLY?=
 
 OPTIONS_DEFINE=	TEST
 OPTIONS_SUB=	yes
 
 TEST_CMAKE_OFF=	-DENABLE_TESTING=OFF
 
-CMAKE_ARGS+=	-DBUILD_DEPS=OFF -DBUILD_ONLY="${BUILD_ONLY}"
+CMAKE_ARGS+=	-DBUILD_DEPS=OFF -DBUILD_ONLY="${BUILD_ONLY}" \
+		-DCMAKE_PREFIX_PATH=${LOCALBASE} -DCMAKE_INSTALL_LIBDIR=lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aws
 USE_LDCONFIG=	yes
 CXXFLAGS+=	-Wno-error -Wno-c11-extensions
 
 pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can build only the clients you need by defining the option BUILD_ONLY."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Example:"
 	@${ECHO_MSG} "make BUILD_ONLY=\"s3;ec2;route53\""
 	@${ECHO_MSG}
 	@${ECHO_MSG} "For more information check the file ${WRKSRC}/Docs/CMake_Parameters.md"
 	@${ECHO_MSG}
 	@${ECHO_MSG} "If this option is not used, the package will be built with support for all the clients."
 	@${ECHO_MSG}
 
 post-patch:
 	${REINPLACE_CMD} -e "s,/pkgconfig,/../libdata/pkgconfig,g" \
 		${WRKSRC}/aws-cpp-sdk-core/CMakeLists.txt \
 		${WRKSRC}/cmake/utilities.cmake
 
 post-install:
 	@cd ${STAGEDIR}/${LOCALBASE} && \
 	${FIND} -s -d * -type f > ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/aws-sdk-cpp/distinfo b/devel/aws-sdk-cpp/distinfo
index 3c62be7ed9da..4b799ee20628 100644
--- a/devel/aws-sdk-cpp/distinfo
+++ b/devel/aws-sdk-cpp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1610096119
-SHA256 (aws-aws-sdk-cpp-1.8.121_GH0.tar.gz) = e2a903312edeae93132ef71ddd29492062a9a64d5d4dbefdb5d8cdbe2e0b1039
-SIZE (aws-aws-sdk-cpp-1.8.121_GH0.tar.gz) = 32562409
+TIMESTAMP = 1634979391
+SHA256 (aws-aws-sdk-cpp-1.9.129_GH0.tar.gz) = d3bde3a687f075666cb577c9defdb85b622b4a1dbad77366ba013486e4f173e6
+SIZE (aws-aws-sdk-cpp-1.9.129_GH0.tar.gz) = 38124053
diff --git a/devel/aws-sdk-cpp/files/patch-testing-resources_include_aws_external_gtest.h b/devel/aws-sdk-cpp/files/patch-testing-resources_include_aws_external_gtest.h
deleted file mode 100644
index 966c7cecf8e8..000000000000
--- a/devel/aws-sdk-cpp/files/patch-testing-resources_include_aws_external_gtest.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- testing-resources/include/aws/external/gtest.h.orig	2020-07-20 22:34:31 UTC
-+++ testing-resources/include/aws/external/gtest.h
-@@ -11883,7 +11883,7 @@ class ValueArray2 {
- 
-  private:
-   // No implementation - assignment is unsupported.
--  void operator=(const ValueArray2& other);
-+  void operator=(const ValueArray2& other) = delete;
- 
-   const T1 v1_;
-   const T2 v2_;
-@@ -21259,4 +21259,4 @@ inline int RUN_ALL_TESTS() {
-   return ::testing::UnitTest::GetInstance()->Run();
- }
- 
--#endif  // GTEST_INCLUDE_GTEST_GTEST_H_
-\ No newline at end of file
-+#endif  // GTEST_INCLUDE_GTEST_GTEST_H_