diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index b0ad08674f7d..5f9fc53c5282 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2020/12/04 04:56:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.41 2021/01/04 14:32:17 prlw1 Exp $
.include "../../print/cups/Makefile.common"
PKGNAME= cups-base-${CUPS_VERS}
-PKGREVISION= 8
-MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
MAINTAINER= sbd@NetBSD.org
COMMENT= Common UNIX Printing System
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index ffbd7a206cbc..c03a4b80e36c 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,11 +1,10 @@
-$NetBSD: distinfo,v 1.24 2020/10/27 09:29:11 jperkin Exp $
+$NetBSD: distinfo,v 1.25 2021/01/04 14:32:17 prlw1 Exp $
-SHA1 (cups-2.3.3-source.tar.gz) = 7a01c9fba5d784eb61eda03fd40e513fd2a1b5b8
-RMD160 (cups-2.3.3-source.tar.gz) = e08afd09666e79d0416f46e14fb8c6b0a6beebd7
-SHA512 (cups-2.3.3-source.tar.gz) = 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
-Size (cups-2.3.3-source.tar.gz) = 8140741 bytes
+SHA1 (cups-2.3.3op1-source.tar.gz) = a4cdab174881d4e6899fbbef637508bed10c5dc9
+RMD160 (cups-2.3.3op1-source.tar.gz) = 6dab18506dfac295c16e4341eb6257f3c01d951e
+SHA512 (cups-2.3.3op1-source.tar.gz) = 89949b4190288d5464f425cbff6b854e9da96ba3071e4e0d595ad581797b2db4724f49d884f3ea43e372ed4d0faec72839b0b7182cdde13b96f2824d619a4843
+Size (cups-2.3.3op1-source.tar.gz) = 7989156 bytes
SHA1 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
-SHA1 (patch-af) = 7f32b1ddaa18d1e58670e5214b954e3b8476a22b
SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717
SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
@@ -16,11 +15,9 @@ SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
SHA1 (patch-conf_Makefile) = ba1c6f9e5c1bb8074038f65f4d17bf55e556738e
SHA1 (patch-config-scripts_cups-compiler.m4) = 71c706121fdf7db699a9b9365ac63779e3c23f67
SHA1 (patch-config-scripts_cups-directories.m4) = 68ff0c9ed333d5b00d11694fca7875c83bf9197d
-SHA1 (patch-config-scripts_cups-dnssd.m4) = 7dd3b0d754e92f3b3f53732163a8001e5fb430c5
SHA1 (patch-config-scripts_cups-gssapi.m4) = 965e54194de9f34f0f252f4993dcf8a8db935003
SHA1 (patch-config-scripts_cups-libtool.m4) = d255bda2b740a04167e20be1662e3b9c242ed8f2
SHA1 (patch-cups-tls.c) = b02bc528b6d551283373f271529d6f1956e1c7df
-SHA1 (patch-cups_getifaddrs-internal.h) = 2e251db9e4d1b01403f3ff8c61a2238a506c12d8
SHA1 (patch-cups_http-addrlist.c) = aa2524ee1c11450cfa3a46b1aa34c12417322241
SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399
SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
diff --git a/print/cups-base/options.mk b/print/cups-base/options.mk
index ed220cea9fdc..ebed4ac198a5 100644
--- a/print/cups-base/options.mk
+++ b/print/cups-base/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2020/10/16 15:29:25 prlw1 Exp $
+# $NetBSD: options.mk,v 1.5 2021/01/04 14:32:17 prlw1 Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.cups-base
PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers
@@ -68,12 +68,6 @@ CONFIGURE_ARGS+= --disable-dnssd
CONFIGURE_ARGS+= --enable-gssapi
.else
CONFIGURE_ARGS+= --disable-gssapi
-# https://github.com/apple/cups/issues/4947
-SUBST_CLASSES+= nokerb
-SUBST_STAGE.nokerb= post-build
-SUBST_SED.nokerb+= -e '\%%,\%%s/^/\#/'
-SUBST_FILES.nokerb+= conf/cupsd.conf
-SUBST_MESSAGE.nokerb= Commenting out kerberos section in config.
.endif
.if !empty(PKG_OPTIONS:Mlibusb)
diff --git a/print/cups-base/patches/patch-af b/print/cups-base/patches/patch-af
deleted file mode 100644
index dbd06f17bfdf..000000000000
--- a/print/cups-base/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.3 2020/10/16 16:31:43 prlw1 Exp $
-
-* Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
-https://github.com/apple/cups/pull/5827
-
---- backend/Makefile.orig 2014-05-08 22:42:44.000000000 +0000
-+++ backend/Makefile
-@@ -118,7 +118,7 @@ install-exec: $(INSTALLXPC)
- echo Installing backends in $(SERVERBIN)/backend
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
- for file in $(RBACKENDS); do \
-- $(LIBTOOL) $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
-+ $(INSTALL_BIN) -m 700 $$file $(SERVERBIN)/backend; \
- done
- for file in $(UBACKENDS); do \
- $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-@@ -142,7 +142,7 @@ install-exec: $(INSTALLXPC)
- install-xpc: ipp
- echo Installing XPC backends in $(SERVERBIN)/apple
- $(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
-- $(LIBTOOL) $(INSTALL_BIN) ipp $(SERVERBIN)/apple
-+ $(INSTALL_BIN) ipp $(SERVERBIN)/apple
- for file in $(IPPALIASES); do \
- $(RM) $(SERVERBIN)/apple/$$file; \
- $(LN) ipp $(SERVERBIN)/apple/$$file; \
diff --git a/print/cups-base/patches/patch-config-scripts_cups-dnssd.m4 b/print/cups-base/patches/patch-config-scripts_cups-dnssd.m4
deleted file mode 100644
index a73e407734df..000000000000
--- a/print/cups-base/patches/patch-config-scripts_cups-dnssd.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-config-scripts_cups-dnssd.m4,v 1.1 2020/10/16 15:11:13 prlw1 Exp $
-
-Build ippfind if dnssd is found (not just avahi).
-This seems to be the intention of cups commit 766a822, but a comma got in the way.
-
---- config-scripts/cups-dnssd.m4.orig 2020-04-27 18:04:29.000000000 +0000
-+++ config-scripts/cups-dnssd.m4
-@@ -60,9 +60,9 @@ if test "x$DNSSD_BACKEND" = x -a x$enabl
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_DNSSD)
- DNSSDLIBS="-ldns_sd"
-- DNSSD_BACKEND="dnssd",
-+ DNSSD_BACKEND="dnssd"
- IPPFIND_BIN="ippfind"
-- IPPFIND_MAN="ippfind.1"
-+ IPPFIND_MAN="ippfind.1",
- AC_MSG_RESULT(no))
- LIBS="$SAVELIBS"
- ;;
diff --git a/print/cups-base/patches/patch-cups_getifaddrs-internal.h b/print/cups-base/patches/patch-cups_getifaddrs-internal.h
deleted file mode 100644
index c20998032931..000000000000
--- a/print/cups-base/patches/patch-cups_getifaddrs-internal.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cups_getifaddrs-internal.h,v 1.1 2020/05/26 08:36:56 triaxx Exp $
-
-FreeBSD bug 182466 that still seems open:
-https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=182466
-
---- cups/getifaddrs-internal.h.orig 2020-04-27 18:04:29.000000000 +0000
-+++ cups/getifaddrs-internal.h
-@@ -39,6 +39,9 @@ typedef int socklen_t;
-
- # ifndef _WIN32
- # include
-+# if defined(__FreeBSD__)
-+# include
-+# endif /* __FreeBSD */
- # include
- # ifdef HAVE_GETIFADDRS
- # include
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 83c5b96105b3..ac0e1a0552f9 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.272 2020/12/04 04:56:09 riastradh Exp $
+# $NetBSD: Makefile,v 1.273 2021/01/04 14:32:17 prlw1 Exp $
-PKGREVISION= 3
.include "../../print/cups/Makefile.common"
PKGNAME= cups-${CUPS_VERS}
diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
index 53fdde40d685..d151080ea303 100644
--- a/print/cups/Makefile.common
+++ b/print/cups/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.12 2020/05/26 08:37:49 triaxx Exp $
+# $NetBSD: Makefile.common,v 1.13 2021/01/04 14:32:17 prlw1 Exp $
#
# used by print/cups/Makefile
# used by print/cups-base/Makefile
# used by print/libcups/Makefile
-CUPS_VERS= 2.3.3
+CUPS_VERS= 2.3.3op1
DISTNAME= cups-${CUPS_VERS}-source
CATEGORIES= print
-HOMEPAGE= https://www.cups.org/
+HOMEPAGE= https://openprinting.github.io/projects/00-cups/
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
diff --git a/print/libcups/Makefile b/print/libcups/Makefile
index e43f40fe56c2..73d978b6428c 100644
--- a/print/libcups/Makefile
+++ b/print/libcups/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2021/01/04 13:08:30 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2021/01/04 14:32:17 prlw1 Exp $
.include "../../print/cups/Makefile.common"
PKGNAME= libcups-${CUPS_VERS}
-PKGREVISION= 5
-MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=OpenPrinting/}
MAINTAINER= sbd@NetBSD.org
COMMENT= Common UNIX Printing System library
diff --git a/print/libcups/options.mk b/print/libcups/options.mk
index 5dd0dd8b8044..6de5114c5050 100644
--- a/print/libcups/options.mk
+++ b/print/libcups/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2020/05/16 18:07:56 maya Exp $
+# $NetBSD: options.mk,v 1.2 2021/01/04 14:32:17 prlw1 Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libcups
PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers
@@ -50,12 +50,6 @@ CONFIGURE_ARGS+= --disable-dnssd
CONFIGURE_ARGS+= --enable-gssapi
.else
CONFIGURE_ARGS+= --disable-gssapi
-# https://github.com/apple/cups/issues/4947
-SUBST_CLASSES+= nokerb
-SUBST_STAGE.nokerb= post-build
-SUBST_SED.nokerb+= -e '\%%,\%%s/^/\#/'
-SUBST_FILES.nokerb+= conf/cupsd.conf
-SUBST_MESSAGE.nokerb= Commenting out kerberos section in config.
.endif
.if !empty(PKG_OPTIONS:Mtcpwrappers)