diff --git a/print/ghostscript9-agpl-base/Makefile b/print/ghostscript9-agpl-base/Makefile
index ca1165a7847c..eb06c5177a7a 100644
--- a/print/ghostscript9-agpl-base/Makefile
+++ b/print/ghostscript9-agpl-base/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	ghostscript
 PORTVERSION=	9.55.0
 CATEGORIES=	print
-MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
+MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//g}/
 PKGNAMESUFFIX=	9-agpl-base
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	PostScript and PDF interpreter
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	jbig2dec>=0.17:graphics/jbig2dec
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn \
 		libjbig2dec.so:graphics/jbig2dec \
 		libopenjp2.so:graphics/openjpeg \
 		libpaper.so:print/libpaper \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS=	poppler-data>=0.4.9:graphics/poppler-data
 
 USES=		cpe gmake iconv jpeg localbase pkgconfig tar:xz
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL= \
 		ghostscript[789] \
 		ghostscript[789]-nox11 \
 		ghostscript9-agpl \
 		ghostscript9-agpl-nox11
 CPE_VENDOR=	artifex
 DATADIR=	${PREFIX}/share/${PORTNAME}/${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION}
 EXTRACT_AFTER_ARGS= \
 	--exclude cups/libs \
 	--exclude freetype \
 	--exclude ijs \
 	--exclude jbig2dec \
 	--exclude jpeg \
 	--exclude libpng \
 	--exclude openjpeg \
 	--exclude zlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-dbus \
 		--disable-gtk \
 		--enable-contrib \
 		--enable-dynamic \
 		--enable-fontconfig \
 		--enable-freetype \
 		--enable-openjpeg \
 		--with-drivers=ALL \
 		--with-fontpath=${LOCALBASE}/share/fonts \
 		--with-jbig2dec \
 		--with-libiconv=maybe \
 		--with-libidn \
 		--with-libpaper \
 		--with-system-libtiff \
 		--without-x
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 PLIST_SUB=	GS_VERSION="${PORTVERSION:S/.0$//}" \
 		PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	DOCS CUPS IJS
 OPTIONS_DEFAULT=DOCS CUPS
 OPTIONS_SUB=	yes
 
 CUPS_CONFIGURE_ENABLE=	cups
 CUPS_LIB_DEPENDS=	libcupsimage.so:print/cups
 
 IJS_CONFIGURE_WITH=	ijs
 IJS_DESC=		Support libijs based Ghostscript devices
 IJS_LIB_DEPENDS=	libijs.so:print/libijs
 
 post-install:
 	${MV} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gs
 	${RM} ${STAGEDIR}${PREFIX}/bin/gsx
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgs.so
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/color/icc
 	${MV} ${STAGEDIR}${DATADIR}/iccprofiles \
 	    ${STAGEDIR}${PREFIX}/share/color/icc/ghostscript
 	${RLN} ${STAGEDIR}${PREFIX}/share/color/icc/ghostscript \
 	    ${STAGEDIR}${DATADIR}/iccprofiles
 	${RLN} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/doc
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/cmap
 	${MV} ${STAGEDIR}${DATADIR}/Resource/CMap/Identity* \
 	    ${STAGEDIR}${PREFIX}/share/cmap
 	${RM} -r ${STAGEDIR}${DATADIR}/Resource/CMap
 	${RLN} ${STAGEDIR}${PREFIX}/share/cmap \
 	    ${STAGEDIR}${DATADIR}/Resource/CMap
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript9-agpl-x11/Makefile b/print/ghostscript9-agpl-x11/Makefile
index 0110561a409b..aa38239f2fe2 100644
--- a/print/ghostscript9-agpl-x11/Makefile
+++ b/print/ghostscript9-agpl-x11/Makefile
@@ -1,71 +1,71 @@
 PORTNAME=	ghostscript
 PORTVERSION=	9.55.0
 CATEGORIES=	print
-MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//}/
+MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PORTVERSION:S/.//g}/
 PKGNAMESUFFIX=	9-agpl-x11
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	PostScript and PDF interpreter, X11 support
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	jbig2dec>=0.17:graphics/jbig2dec
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libidn.so:dns/libidn \
 		libjbig2dec.so:graphics/jbig2dec \
 		libopenjp2.so:graphics/openjpeg \
 		libpaper.so:print/libpaper \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 RUN_DEPENDS=	ghostscript9-agpl-base>=${PORTVERSION}:print/ghostscript9-agpl-base
 
 USES=		cpe gmake iconv localbase pkgconfig tar:xz xorg
 USE_LDCONFIG=	yes
 USE_XORG=	ice sm x11 xext xt
 
 CONFLICTS_INSTALL= \
 		ghostscript[789] \
 		ghostscript[789]-nox11 \
 		ghostscript9-agpl \
 		ghostscript9-agpl-nox11
 DISTINFO_FILE=	${.CURDIR:H}/ghostscript9-agpl-base/distinfo
 PATCHDIR=	${.CURDIR:H}/ghostscript9-agpl-base/files
 CPE_VENDOR=	artifex
 EXTRACT_AFTER_ARGS= \
 	--exclude freetype \
 	--exclude ijs \
 	--exclude jbig2dec \
 	--exclude jpeg \
 	--exclude libpng \
 	--exclude openjpeg \
 	--exclude zlib
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-compile-inits \
 		--disable-cups \
 		--disable-dbus \
 		--disable-gtk \
 		--disable-openjpeg \
 		--enable-contrib \
 		--enable-dynamic \
 		--enable-fontconfig \
 		--enable-freetype \
 		--enable-openjpeg \
 		--with-drivers=ALL \
 		--with-fontpath=${LOCALBASE}/share/fonts \
 		--with-jbig2dec \
 		--with-libiconv=maybe \
 		--with-libidn \
 		--with-libpaper \
 		--with-system-libtiff \
 		--with-x \
 		--without-ijs
 ALL_TARGET=	./obj/X11.so
 INSTALL_TARGET=	install-shared
 PLIST_FILES=	lib/${PORTNAME}/${PORTVERSION}/X11.so
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/${PORTVERSION}/X11.so
 
 .include <bsd.port.mk>