diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index 2db8dd865a79..9f083332d2d6 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -1,54 +1,55 @@
 # Created by: Sergey Matveychuk <sem@ciam.ru>
 
 PORTNAME=	gsoap
-PORTVERSION=	2.8.117
-PORTREVISION=	1
+PORTVERSION=	2.8.118
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Generator Tools for Coding SOAP/XML Web Services in C and C++
 
 LICENSE=	GPLv2
 
 USES=		autoreconf cpe pathfix ssl zip
 CPE_VENDOR=	genivia
 
-CONFIGURE_ENV=	LEX=flex YACC=yacc
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LEX=flex \
+		YACC=yacc
+
 MAKE_JOBS_UNSAFE=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
-OPTIONS_DEFINE=	IPV6
-OPTIONS_RADIO=	SSL
-OPTIONS_RADIO_SSL=	GNUTLS OPENSSL
-OPTIONS_DEFAULT=	OPENSSL IPV6
-GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
-			libgcrypt.so:security/libgcrypt \
-			libgpg-error.so:security/libgpg-error
-GNUTLS_CONFIGURE_ON=	--enable-gnutls
-GNUTLS_LDFLAGS=		-L${LOCALBASE}/lib
-OPENSSL_CONFIGURE_ENABLE=	ssl
-IPV6_CONFIGURE_ENABLE=	ipv6
-CFLAGS+=	-fPIC -I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
+CFLAGS+=			-fPIC -I${OPENSSLINC}
+LDFLAGS+=			-L${OPENSSLLIB}
 
 PORTSCOUT=	limit:^2\.8\.[0-9][0-9][0-9]$
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
+OPTIONS_DEFINE=			IPV6
+OPTIONS_DEFAULT=		IPV6 OPENSSL
+OPTIONS_RADIO=			SSL
+OPTIONS_RADIO_SSL=		GNUTLS OPENSSL
+GNUTLS_LIB_DEPENDS=		libgcrypt.so:security/libgcrypt \
+				libgnutls.so:security/gnutls \
+				libgpg-error.so:security/libgpg-error
+GNUTLS_CONFIGURE_ON=		--enable-gnutls
+GNUTLS_LDFLAGS=			-L${LOCALBASE}/lib
+IPV6_CONFIGURE_ENABLE=		ipv6
+OPENSSL_CONFIGURE_ENABLE=	ssl
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|sys/timeb.h | |' \
 	    -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \
 	    -e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \
 	    ${WRKSRC}/configure.ac
-	@${REINPLACE_CMD} -e 's|$$(libdir)|$$(libdir)data|' \
-	    ${WRKSRC}/Makefile.am
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap
 	${INSTALL_DATA} ${WRKSRC}/gsoap/stdsoap2.c ${WRKSRC}/gsoap/dom.cpp \
 	    ${STAGEDIR}${PREFIX}/lib/gsoap
 	@${LN} -fs stdsoap2.c ${STAGEDIR}${PREFIX}/lib/gsoap/stdsoap2.cpp
 	@${LN} -fs dom.cpp ${STAGEDIR}${PREFIX}/lib/gsoap/dom.c
 
 .include <bsd.port.mk>
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index 3a685c04ac8f..d556d8558549 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632773745
-SHA256 (gsoap_2.8.117.zip) = 7cadf8808cfd982629948fe09e4fa6cd18e23cafd40df0aaaff1b1f5b695c442
-SIZE (gsoap_2.8.117.zip) = 34891591
+TIMESTAMP = 1642520662
+SHA256 (gsoap_2.8.118.zip) = f233f06a307a664ab1ecafd8f6d87b9c905a98c497c9f5da9083790e5b921f50
+SIZE (gsoap_2.8.118.zip) = 35140436