diff --git a/print/dymo-cups-drivers/Makefile b/print/dymo-cups-drivers/Makefile
index 19669d28d042..097dd8773bb0 100644
--- a/print/dymo-cups-drivers/Makefile
+++ b/print/dymo-cups-drivers/Makefile
@@ -1,28 +1,21 @@
 PORTNAME=	dymo-cups-drivers
 PORTVERSION=	1.4.0
 PORTREVISION=	4
 CATEGORIES=	print
-MASTER_SITES=	http://download.dymo.com/Software/Linux/
+MASTER_SITES=	https://download.dymo.com/Software/Linux/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source DYMO CUPS driver
-WWW=		https://www.dymo.com
+WWW=		https://www.dymo.com/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libcupsimage.so:print/cups
 
-USES=	localbase:ldflags
-
+USES=		localbase:ldflags
 GNU_CONFIGURE=	yes
 
 WRKSRC=		${WRKDIR}/dymo-cups-drivers-1.4.0.5
 
-.include <bsd.port.options.mk>
-
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
-USES+=	llvm:max=15
-.endif
-
 .include <bsd.port.mk>
diff --git a/print/dymo-cups-drivers/files/patch-src-common-CupsFilter.h b/print/dymo-cups-drivers/files/patch-src-common-CupsFilter.h
index ecb79b728861..e9a5a56b0926 100644
--- a/print/dymo-cups-drivers/files/patch-src-common-CupsFilter.h
+++ b/print/dymo-cups-drivers/files/patch-src-common-CupsFilter.h
@@ -1,10 +1,19 @@
 --- src/common/CupsFilter.h.orig	2012-02-07 13:22:37 UTC
 +++ src/common/CupsFilter.h
 @@ -22,6 +22,7 @@
  #define hfc4bbdea_8a1b_427c_9ab5_50b84576b19e
  
  #include <cups/cups.h>
 +#include <cups/ppd.h>
  #include <cups/raster.h>
  #include <memory>
  #include <string>
+@@ -132,7 +133,7 @@ CCupsFilter<D, DI, LM>::Run(int argc, char* argv[])
+     bool UseCustomHalftoning    = PageHeader.cupsBitsPerPixel > 1;
+     bool IsProcessLineSupported = true;
+ 
+-    std::auto_ptr<CHalftoneFilter> H;
++    std::unique_ptr<CHalftoneFilter> H;
+     if (UseCustomHalftoning)
+     {
+       if (HalftoningMethod_ == "NLL")