libcups: fix build failure on FreeBSD

pkgsrc changes:
---------------
  * Add conditional inclusion for FreeBSD.
  * Apply some changes to appease pkglint.
  * Bump revision.

23 files changed, 106 insertions, 97 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 513c2d1d140..250ce336605 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,17 +1,13 @@
-# $NetBSD: Makefile,v 1.35 2020/05/22 10:55:49 adam Exp $
+# $NetBSD: Makefile,v 1.36 2020/05/26 08:36:55 triaxx Exp $
 
 .include "../../print/cups/Makefile.common"
 
-DISTNAME=	cups-${CUPS_VERS}-source
 PKGNAME=	cups-base-${CUPS_VERS}
-PKGREVISION=	3
-CATEGORIES=	print
+PKGREVISION=	4
 MASTER_SITES=	${MASTER_SITE_GITHUB:=apple/}
 
 MAINTAINER=	sbd@NetBSD.org
-HOMEPAGE=	https://www.cups.org/
 COMMENT=	Common UNIX Printing System
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2
 
 GITHUB_PROJECT=	cups
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
@@ -56,13 +52,6 @@ LIBS+=			${BUILDLINK_LDADD.iconv}
 # can not be used when making a shared object; recompile with -fPIC
 BUILDLINK_TRANSFORM.FreeBSD+=	rm:-Wl,-pie
 
-# CUPS_USER		user to run filter and CGI programs as
-# CUPS_GROUP		group to run filter and CGI programs as
-# CUPS_SYSTEM_GROUPS	group for system administration
-#
-CUPS_USER?=		lp
-CUPS_GROUP?=		lp
-CUPS_SYSTEM_GROUPS?=	${REAL_ROOT_GROUP}
 FILES_SUBST+=		CUPS_USER=${CUPS_USER}
 FILES_SUBST+=		CUPS_GROUP=${CUPS_GROUP}
 FILES_SUBST+=		CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
@@ -116,7 +105,7 @@ SUBST_MESSAGE.rpathfix=	Adding rpath to cups-config.
 SUBST_SED.rpathfix=	-e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g'
 SUBST_STAGE.rpathfix=	pre-configure
 
-.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
+.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
diff --git a/print/cups-base/buildlink3.mk b/print/cups-base/buildlink3.mk
index 318819dd7bb..7cccea69729 100644
--- a/print/cups-base/buildlink3.mk
+++ b/print/cups-base/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2020/05/22 10:55:49 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2020/05/26 08:36:55 triaxx Exp $
 
 BUILDLINK_TREE+=	cups-base
 
@@ -6,21 +6,21 @@ BUILDLINK_TREE+=	cups-base
 CUPS_BASE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cups-base+=	cups-base>=1.1.19nb3
-BUILDLINK_ABI_DEPENDS.cups-base+=	cups-base>=2.3.3nb3
+BUILDLINK_ABI_DEPENDS.cups-base+=	cups-base>=2.3.3nb4
 BUILDLINK_PKGSRCDIR.cups-base?=		../../print/cups-base
 
 pkgbase := cups-base
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.cups-base:Mkerberos)
+.if ${PKG_BUILD_OPTIONS.cups-base:Mkerberos}
 .include "../../mk/krb5.buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.cups-base:Mdnssd)
+.if ${PKG_BUILD_OPTIONS.cups-base:Mdnssd}
 .include "../../net/mDNSResponder/buildlink3.mk"
 .endif
 
-.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups-base:Mavahi)
+.if ${OPSYS} != "Darwin" && ${PKG_BUILD_OPTIONS.cups-base:Mdnssd}
 .include "../../net/avahi/buildlink3.mk"
 .endif
 
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index c0cd2a24153..bb45bc3f561 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1,30 +1,31 @@
-$NetBSD: distinfo,v 1.20 2020/05/14 19:45:50 joerg Exp $
+$NetBSD: distinfo,v 1.21 2020/05/26 08:36:55 triaxx 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 (patch-ae) = b81d7a2ce457f0d6994d6a084c63aa0a870bb881
-SHA1 (patch-af) = 6ae6ae6006387db69bf7c15f7c8500708c9e8f56
-SHA1 (patch-ai) = 2c1ca67ea6f6c1dedb4c8ff97736f328a2b9a7c6
-SHA1 (patch-airprint-conf_mime.convs.in) = 413a5ef448ab42858db804cfbfc1b8ff5b6bbf77
+SHA1 (patch-af) = e72b6089ce1bf0c9bfa2eb60fbf5aa41f53f2ef1
+SHA1 (patch-ai) = d4aa1b59c77fa2cbf614eb661d9a791311b399c2
+SHA1 (patch-airprint-conf_mime.convs.in) = e0813b7e1da2337191bc6bfc2a6888f4173b8717
 SHA1 (patch-airprint-scheduler_conf.c) = 504e752c1699049cdbe11d8b04814670ddda81d4
-SHA1 (patch-airprint-scheduler_dirsvc.c) = bef4ea8e898dffc67c4866baa701e12570eb6fca
+SHA1 (patch-airprint-scheduler_dirsvc.c) = b861ee4cacb110c755e22c8a691b064a6553019d
 SHA1 (patch-airprint-scheduler_printers.c) = 027b9b1515ba0fc472f6d3c5308d35849ac5ae3b
-SHA1 (patch-at) = ef6303936daf0826dc4725f5369bfb1add832b1f
+SHA1 (patch-at) = 9517bff0bf2c892f0723a25f243ba188f7781393
 SHA1 (patch-conf-cups-files.conf.in) = b2eccf54e108d8c9e70094acfd9618a66779a84a
-SHA1 (patch-conf_Makefile) = bb8313e493c02959edfe1e53f50b9f16ce6f42e0
-SHA1 (patch-config-scripts_cups-compiler.m4) = 26f2ed2ef45d922f47e5e0ac87ccc278f35de7f3
-SHA1 (patch-config-scripts_cups-directories.m4) = 8a6c2f962dafdde20f913fac2e172ae9f8760c3e
-SHA1 (patch-config-scripts_cups-gssapi.m4) = ac2df3e82bc844630af8462a461c7efe1da4b354
-SHA1 (patch-config-scripts_cups-libtool.m4) = a6139fbbbee7038d11654c0a2387af21f48b7412
-SHA1 (patch-cups-tls.c) = f89c25f8089d9e11a983a270adbb2cbde3c22511
+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-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) = e625a2b81f3d831d2a0c02bc0fa9a9d31c1097a7
+SHA1 (patch-cups_thread.c) = 7ffb9a5835f345b29ad0cc9e253bb1d7ead9a399
 SHA1 (patch-doc-help-man-cups-files.conf.html) = c26754104788eb619e69e49d6d51bf84ab047876
-SHA1 (patch-man-cups-files.conf.man.in) = 08c0322fd233c724b7df238df01988500130d1c6
+SHA1 (patch-man-cups-files.conf.man.in) = 51c06d39e20bf8c39c784fec1f32f6c8100cf821
 SHA1 (patch-scheduler-conf.c) = 1e3e116b6a0b5696656afe259ed48f6274ff6b57
-SHA1 (patch-scheduler-conf.h) = d11f3b789af096dcaca13a38f6484727ff895bee
-SHA1 (patch-scheduler-main.c) = cb31fa7427b497108ce7724bbfee1b784b9330ab
-SHA1 (patch-scheduler_auth.c) = 8c9a5338c9eb84336db0d487008795227fa9e7f0
-SHA1 (patch-scheduler_dirsvc.c) = aae5b924fb8fb39007cf04d8b83747e8724485cf
+SHA1 (patch-scheduler-conf.h) = cd5c49579795c69b50abbff2b0f9604ffe8bfa5a
+SHA1 (patch-scheduler-main.c) = a5410c7f78756506d23d705dfa93a756fe3e513e
+SHA1 (patch-scheduler_auth.c) = 686b26286b7ad88363ddc7b394aefbfb3ad26c2d
+SHA1 (patch-scheduler_dirsvc.c) = 1dba98dc171df733acb99e5f31ad838845a917bc
diff --git a/print/cups-base/patches/patch-af b/print/cups-base/patches/patch-af
index 3b35445e41d..b730d0a0779 100644
--- a/print/cups-base/patches/patch-af
+++ b/print/cups-base/patches/patch-af
@@ -1,10 +1,10 @@
-$NetBSD: patch-af,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-af,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 * Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN).
 
 --- backend/Makefile.orig	2014-05-08 22:42:44.000000000 +0000
 +++ backend/Makefile
-@@ -126,7 +126,7 @@ install-exec:	$(INSTALLXPC)
+@@ -118,7 +118,7 @@ install-exec:	$(INSTALLXPC)
  	echo Installing backends in $(SERVERBIN)/backend
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
  	for file in $(RBACKENDS); do \
@@ -13,7 +13,7 @@ $NetBSD: patch-af,v 1.1 2017/11/12 14:10:15 khorben Exp $
  	done
  	for file in $(UBACKENDS); do \
  		$(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-@@ -150,7 +150,7 @@ install-exec:	$(INSTALLXPC)
+@@ -142,7 +142,7 @@ install-exec:	$(INSTALLXPC)
  install-xpc:	ipp
  	echo Installing XPC backends in $(SERVERBIN)/apple
  	$(INSTALL_DIR) -m 755 $(SERVERBIN)/apple
diff --git a/print/cups-base/patches/patch-ai b/print/cups-base/patches/patch-ai
index 6b534c7a17d..a6d909b69fb 100644
--- a/print/cups-base/patches/patch-ai
+++ b/print/cups-base/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-ai,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
 --- notifier/Makefile.orig	2013-05-29 11:51:34.000000000 +0000
 +++ notifier/Makefile
-@@ -62,6 +62,8 @@ install:	all install-data install-header
+@@ -56,6 +56,8 @@ install:	all install-data install-header
  #
  
  install-data:
diff --git a/print/cups-base/patches/patch-airprint-conf_mime.convs.in b/print/cups-base/patches/patch-airprint-conf_mime.convs.in
index 1b79bc1aeb1..38d4aba4d42 100644
--- a/print/cups-base/patches/patch-airprint-conf_mime.convs.in
+++ b/print/cups-base/patches/patch-airprint-conf_mime.convs.in
@@ -1,4 +1,4 @@
-$NetBSD: patch-airprint-conf_mime.convs.in,v 1.1 2018/07/24 12:19:21 bouyer Exp $
+$NetBSD: patch-airprint-conf_mime.convs.in,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
@@ -25,7 +25,7 @@ diff --git a/conf/mime.convs.in b/conf/mime.convs.in
 index bffd04f84..33ce812e3 100644
 --- conf/mime.convs.in.orig
 +++ conf/mime.convs.in
-@@ -47,6 +47,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
+@@ -44,6 +44,9 @@ application/postscript		application/vnd.cups-postscript	66	pstops
  application/vnd.cups-raster	image/pwg-raster		100	rastertopwg
  application/vnd.cups-raster	image/urf			100	rastertopwg
  
diff --git a/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c b/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c
index 9b35a5c2d2f..8fcc7fa87e7 100644
--- a/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c
+++ b/print/cups-base/patches/patch-airprint-scheduler_dirsvc.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-airprint-scheduler_dirsvc.c,v 1.1 2018/07/24 12:19:21 bouyer Exp $
+$NetBSD: patch-airprint-scheduler_dirsvc.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 From bbc3507a260d29db3fc5601826f33c10f9dccd1e Mon Sep 17 00:00:00 2001
 From: Till Kamppeter <till.kamppeter@gmail.com>
@@ -25,7 +25,7 @@ diff --git a/scheduler/dirsvc.c b/scheduler/dirsvc.c
 index 3dab90ca9..f21942af3 100644
 --- scheduler/dirsvc.c.orig
 +++ scheduler/dirsvc.c
-@@ -443,6 +443,12 @@ dnssdBuildTxtRecord(
+@@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
      keyvalue[count  ][0] = "pdl";
      keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
  
diff --git a/print/cups-base/patches/patch-at b/print/cups-base/patches/patch-at
index 9539a9e4162..91a30ae8096 100644
--- a/print/cups-base/patches/patch-at
+++ b/print/cups-base/patches/patch-at
@@ -1,10 +1,10 @@
-$NetBSD: patch-at,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-at,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS
 
 --- scheduler/Makefile.orig	2015-02-17 13:10:19.000000000 +0000
 +++ scheduler/Makefile
-@@ -145,6 +145,8 @@ install:	all install-data install-header
+@@ -138,6 +138,8 @@ install:	all install-data install-header
  #
  
  install-data:
diff --git a/print/cups-base/patches/patch-conf_Makefile b/print/cups-base/patches/patch-conf_Makefile
index 20ce94a3a94..1f3075f8a81 100644
--- a/print/cups-base/patches/patch-conf_Makefile
+++ b/print/cups-base/patches/patch-conf_Makefile
@@ -1,10 +1,10 @@
-$NetBSD: patch-conf_Makefile,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-conf_Makefile,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Don't install the config files (leave it up to pkgsrc).
 
 --- conf/Makefile.orig	2015-02-27 12:30:26.000000000 +0000
 +++ conf/Makefile
-@@ -70,22 +70,8 @@ install:	all install-data install-header
+@@ -64,22 +64,8 @@ install:	all install-data install-header
  #
  
  install-data:
diff --git a/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4
index 2f52dcb8ebe..075b2f66d33 100644
--- a/print/cups-base/patches/patch-config-scripts_cups-compiler.m4
+++ b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4
@@ -1,11 +1,11 @@
-$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.2 2018/01/26 17:22:51 jperkin Exp $
+$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.3 2020/05/26 08:36:56 triaxx Exp $
 
 Disable SSP checks, leave pkgsrc to enable/disable it.
 PIE needs to be tested with linking.
 
 --- config-scripts/cups-compiler.m4.orig	2017-11-01 14:57:53.000000000 +0000
 +++ config-scripts/cups-compiler.m4
-@@ -115,12 +115,13 @@ if test -n "$GCC"; then
+@@ -129,12 +129,13 @@ if test -n "$GCC"; then
  	AC_MSG_CHECKING(whether compiler supports -fstack-protector)
  	OLDCFLAGS="$CFLAGS"
  	CFLAGS="$CFLAGS -fstack-protector"
@@ -22,7 +22,7 @@ PIE needs to be tested with linking.
  		fi
  		AC_MSG_RESULT(yes),
  		AC_MSG_RESULT(no))
-@@ -137,7 +138,7 @@ if test -n "$GCC"; then
+@@ -151,7 +152,7 @@ if test -n "$GCC"; then
  		case "$host_os_name" in
  			darwin*)
  				CFLAGS="$CFLAGS -fPIE -Wl,-pie"
@@ -31,7 +31,7 @@ PIE needs to be tested with linking.
  					PIEFLAGS="-fPIE -Wl,-pie"
  					AC_MSG_RESULT(yes)],
  					AC_MSG_RESULT(no))
-@@ -145,7 +146,7 @@ if test -n "$GCC"; then
+@@ -159,7 +160,7 @@ if test -n "$GCC"; then
  
  			*)
  				CFLAGS="$CFLAGS -fPIE -pie"
diff --git a/print/cups-base/patches/patch-config-scripts_cups-directories.m4 b/print/cups-base/patches/patch-config-scripts_cups-directories.m4
index 404da496380..be9a5107a61 100644
--- a/print/cups-base/patches/patch-config-scripts_cups-directories.m4
+++ b/print/cups-base/patches/patch-config-scripts_cups-directories.m4
@@ -1,4 +1,4 @@
-$NetBSD: patch-config-scripts_cups-directories.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-config-scripts_cups-directories.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 The '$' while loops expand the variables as long as possible so that no
 references to other variables occur. This is necessary because fontpath
@@ -11,7 +11,7 @@ works.
 
 --- config-scripts/cups-directories.m4.orig	2017-06-30 15:44:38.000000000 +0000
 +++ config-scripts/cups-directories.m4
-@@ -101,7 +101,7 @@ dnl Fix "libdir" variable...
+@@ -97,7 +97,7 @@ dnl Fix "libdir" variable...
  if test "$libdir" = "\${exec_prefix}/lib"; then
  	case "$host_os_name" in
  		linux*)
@@ -20,7 +20,7 @@ works.
  				libdir="$exec_prefix/lib64"
  			fi
  			;;
-@@ -178,7 +178,15 @@ AC_SUBST(CUPS_CACHEDIR)
+@@ -174,7 +174,15 @@ AC_SUBST(CUPS_CACHEDIR)
  
  # Data files
  CUPS_DATADIR="$datadir/cups"
@@ -37,7 +37,7 @@ works.
  AC_SUBST(CUPS_DATADIR)
  
  # Icon directory
-@@ -187,7 +195,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
+@@ -183,7 +191,11 @@ AC_ARG_WITH(icondir, [  --with-icondir  
  if test "x$icondir" = x -a -d /usr/share/icons; then
  	ICONDIR="/usr/share/icons"
  else
@@ -50,7 +50,7 @@ works.
  fi
  
  AC_SUBST(ICONDIR)
-@@ -198,7 +210,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
+@@ -194,7 +202,11 @@ AC_ARG_WITH(menudir, [  --with-menudir  
  if test "x$menudir" = x -a -d /usr/share/applications; then
  	MENUDIR="/usr/share/applications"
  else
@@ -63,7 +63,7 @@ works.
  fi
  
  AC_SUBST(MENUDIR)
-@@ -213,7 +229,15 @@ else
+@@ -209,7 +226,15 @@ else
  	CUPS_DOCROOT="$docdir"
  fi
  
@@ -80,7 +80,7 @@ works.
  AC_SUBST(CUPS_DOCROOT)
  
  # Fonts
-@@ -225,8 +249,16 @@ else
+@@ -221,8 +245,16 @@ else
  	CUPS_FONTPATH="$fontpath"
  fi
  
@@ -98,7 +98,7 @@ works.
  
  # Locale data
  if test "$localedir" = "\${datarootdir}/locale"; then
-@@ -244,6 +276,14 @@ else
+@@ -240,6 +272,14 @@ else
  	CUPS_LOCALEDIR="$localedir"
  fi
  
@@ -113,7 +113,7 @@ works.
  AC_DEFINE_UNQUOTED(CUPS_LOCALEDIR, "$CUPS_LOCALEDIR")
  AC_SUBST(CUPS_LOCALEDIR)
  
-@@ -252,7 +292,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
+@@ -248,7 +288,6 @@ AC_ARG_WITH(logdir, [  --with-logdir    
  
  if test x$logdir = x; then
  	CUPS_LOGDIR="$localstatedir/log/cups"
@@ -121,7 +121,7 @@ works.
  else
  	CUPS_LOGDIR="$logdir"
  fi
-@@ -261,10 +300,13 @@ AC_SUBST(CUPS_LOGDIR)
+@@ -257,10 +296,13 @@ AC_SUBST(CUPS_LOGDIR)
  
  # Longer-term spool data
  CUPS_REQUESTS="$localstatedir/spool/cups"
@@ -136,7 +136,7 @@ works.
  case "$host_os_name" in
  	*bsd* | darwin*)
  		# *BSD and Darwin (macOS)
-@@ -277,6 +319,10 @@ case "$host_os_name" in
+@@ -273,6 +315,10 @@ case "$host_os_name" in
  		CUPS_SERVERBIN="$exec_prefix/lib/cups"
  		;;
  esac
@@ -147,7 +147,7 @@ works.
  
  AC_DEFINE_UNQUOTED(CUPS_SERVERBIN, "$CUPS_SERVERBIN")
  AC_SUBST(CUPS_SERVERBIN)
-@@ -284,7 +330,7 @@ AC_SUBST(INSTALL_SYSV)
+@@ -280,7 +326,7 @@ AC_SUBST(INSTALL_SYSV)
  
  # Configuration files
  CUPS_SERVERROOT="$sysconfdir/cups"
diff --git a/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4
index 5056aceff53..0922db8086d 100644
--- a/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4
+++ b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4
@@ -1,11 +1,11 @@
-$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 builtin krb5-config in platforms such as solaris do not support
 the gssapi option, and need an explicit -lgss
 
 --- config-scripts/cups-gssapi.m4.orig	2017-06-30 15:44:38.000000000 +0000
 +++ config-scripts/cups-gssapi.m4
-@@ -34,19 +34,18 @@ if test x$enable_gssapi != xno; then
+@@ -30,19 +30,18 @@ if test x$enable_gssapi != xno; then
  					AC_MSG_RESULT(no)
  				fi
  				;;
diff --git a/print/cups-base/patches/patch-config-scripts_cups-libtool.m4 b/print/cups-base/patches/patch-config-scripts_cups-libtool.m4
index ac832078edc..0025f7c072d 100644
--- a/print/cups-base/patches/patch-config-scripts_cups-libtool.m4
+++ b/print/cups-base/patches/patch-config-scripts_cups-libtool.m4
@@ -1,10 +1,10 @@
-$NetBSD: patch-config-scripts_cups-libtool.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-config-scripts_cups-libtool.m4,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Fix non-portable `==' test(1) operator.
 
 --- config-scripts/cups-libtool.m4.orig	2017-10-13 18:22:26.000000000 +0000
 +++ config-scripts/cups-libtool.m4
-@@ -14,7 +14,7 @@ dnl
+@@ -10,7 +10,7 @@ dnl
  AC_ARG_ENABLE(libtool_unsupported, [  --enable-libtool-unsupported=/path/to/libtool
                            build with libtool (UNSUPPORTED!)],
  	[if test x$enable_libtool_unsupported != xno; then
diff --git a/print/cups-base/patches/patch-cups-tls.c b/print/cups-base/patches/patch-cups-tls.c
index 226fd58430b..45bd5ba6387 100644
--- a/print/cups-base/patches/patch-cups-tls.c
+++ b/print/cups-base/patches/patch-cups-tls.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-cups-tls.c,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-cups-tls.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Add missing stub.
 
 --- cups/tls.c.orig	2014-08-29 15:19:40.000000000 +0000
 +++ cups/tls.c
-@@ -50,6 +50,13 @@
+@@ -43,6 +43,13 @@
  #    include "tls-sspi.c"
  #  endif /* HAVE_GNUTLS */
  #else
diff --git a/print/cups-base/patches/patch-cups_getifaddrs-internal.h b/print/cups-base/patches/patch-cups_getifaddrs-internal.h
new file mode 100644
index 00000000000..c2099803293
--- /dev/null
+++ b/print/cups-base/patches/patch-cups_getifaddrs-internal.h
@@ -0,0 +1,17 @@
+$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 <net/if.h>
++#    if defined(__FreeBSD__)
++#      include <netinet/in.h>
++#    endif /* __FreeBSD */
+ #    include <resolv.h>
+ #    ifdef HAVE_GETIFADDRS
+ #      include <ifaddrs.h>
diff --git a/print/cups-base/patches/patch-cups_thread.c b/print/cups-base/patches/patch-cups_thread.c
index 8791bbcd10d..4e6a6087654 100644
--- a/print/cups-base/patches/patch-cups_thread.c
+++ b/print/cups-base/patches/patch-cups_thread.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-cups_thread.c,v 1.1 2018/07/09 13:53:34 youri Exp $
+$NetBSD: patch-cups_thread.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Patch for macOS Sierra and before.
 
 --- cups/thread.c.orig	2018-06-05 16:06:54.000000000 +0000
 +++ cups/thread.c
-@@ -19,6 +19,26 @@
+@@ -14,6 +14,26 @@
  #include "cups-private.h"
  #include "thread-private.h"
  
diff --git a/print/cups-base/patches/patch-man-cups-files.conf.man.in b/print/cups-base/patches/patch-man-cups-files.conf.man.in
index 0fa825ba2e9..0ee0e0c3f6b 100644
--- a/print/cups-base/patches/patch-man-cups-files.conf.man.in
+++ b/print/cups-base/patches/patch-man-cups-files.conf.man.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-man-cups-files.conf.man.in,v 1.3 2019/11/17 21:22:03 leot Exp $
+$NetBSD: patch-man-cups-files.conf.man.in,v 1.4 2020/05/26 08:36:56 triaxx Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
 --- man/cups-files.conf.5.orig	2018-06-05 16:06:54.000000000 +0000
 +++ man/cups-files.conf.5
-@@ -157,6 +157,12 @@ The server name may be included in filen
+@@ -154,6 +154,12 @@ The server name may be included in filen
  
  .fi
  The default is "/var/log/cups/page_log".
diff --git a/print/cups-base/patches/patch-scheduler-conf.h b/print/cups-base/patches/patch-scheduler-conf.h
index da85398f6a0..94c36d34dad 100644
--- a/print/cups-base/patches/patch-scheduler-conf.h
+++ b/print/cups-base/patches/patch-scheduler-conf.h
@@ -1,10 +1,10 @@
-$NetBSD: patch-scheduler-conf.h,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-scheduler-conf.h,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
 --- scheduler/conf.h.orig	2017-03-28 20:26:53.000000000 +0200
 +++ scheduler/conf.h	2017-07-17 17:25:02.000000000 +0200
-@@ -134,6 +134,8 @@
+@@ -131,6 +131,8 @@
  					/* Cache file directory */
  			*DataDir		VALUE(NULL),
  					/* Data file directory */
diff --git a/print/cups-base/patches/patch-scheduler-main.c b/print/cups-base/patches/patch-scheduler-main.c
index a88c1b4ea31..b0ea677b6ed 100644
--- a/print/cups-base/patches/patch-scheduler-main.c
+++ b/print/cups-base/patches/patch-scheduler-main.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-scheduler-main.c,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-scheduler-main.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 Add a PidFile configuration directive to write a PID file.
 
 --- scheduler/main.c.orig	2017-10-13 18:22:26.000000000 +0000
 +++ scheduler/main.c
-@@ -61,6 +61,7 @@
+@@ -62,6 +62,7 @@
   * Local functions...
   */
  
@@ -26,7 +26,7 @@ Add a PidFile configuration directive to write a PID file.
    * Send server-started event...
    */
  
-@@ -1143,6 +1151,7 @@ main(int  argc,				/* I - Number of comm
+@@ -1158,6 +1166,7 @@ main(int  argc,				/* I - Number of comm
                    "Scheduler shutting down due to program error.");
    }
  
@@ -34,7 +34,7 @@ Add a PidFile configuration directive to write a PID file.
   /*
    * Close all network clients...
    */
-@@ -1168,6 +1177,12 @@ main(int  argc,				/* I - Number of comm
+@@ -1183,6 +1192,12 @@ main(int  argc,				/* I - Number of comm
    */
  
    cupsdDeleteTemporaryPrinters(1);
@@ -47,7 +47,7 @@ Add a PidFile configuration directive to write a PID file.
  
  #ifdef __APPLE__
   /*
-@@ -2088,6 +2103,36 @@ service_checkout(int shutdown)          
+@@ -2122,6 +2137,36 @@ service_checkout(int shutdown)          
  
  
  /*
diff --git a/print/cups-base/patches/patch-scheduler_auth.c b/print/cups-base/patches/patch-scheduler_auth.c
index 16e04479ac1..27ad55f5188 100644
--- a/print/cups-base/patches/patch-scheduler_auth.c
+++ b/print/cups-base/patches/patch-scheduler_auth.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-scheduler_auth.c,v 1.3 2018/06/11 10:04:25 adam Exp $
+$NetBSD: patch-scheduler_auth.c,v 1.4 2020/05/26 08:36:56 triaxx Exp $
 
 - Don't pull in sys/ucred.h on Solaris as it results in procfs.h being
   included and conflicts between _FILE_OFFSET_BITS=64 and 32-bit procfs.
@@ -6,7 +6,7 @@ $NetBSD: patch-scheduler_auth.c,v 1.3 2018/06/11 10:04:25 adam Exp $
 
 --- scheduler/auth.c.orig	2018-06-05 16:06:54.000000000 +0000
 +++ scheduler/auth.c
-@@ -47,7 +47,7 @@ extern const char *cssmErrorString(int e
+@@ -39,7 +39,7 @@ extern const char *cssmErrorString(int e
  #ifdef HAVE_SYS_PARAM_H
  #  include <sys/param.h>
  #endif /* HAVE_SYS_PARAM_H */
@@ -15,7 +15,7 @@ $NetBSD: patch-scheduler_auth.c,v 1.3 2018/06/11 10:04:25 adam Exp $
  #  include <sys/ucred.h>
  typedef struct xucred cupsd_ucred_t;
  #  define CUPSD_UCRED_UID(c) (c).cr_uid
-@@ -399,7 +399,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+@@ -389,7 +389,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
      con->type = CUPSD_AUTH_BASIC;
    }
  #endif /* HAVE_AUTHORIZATION_H */
@@ -24,7 +24,7 @@ $NetBSD: patch-scheduler_auth.c,v 1.3 2018/06/11 10:04:25 adam Exp $
    else if (!strncmp(authorization, "PeerCred ", 9) &&
             con->http->hostaddr->addr.sa_family == AF_LOCAL && con->best)
    {
-@@ -836,7 +836,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
+@@ -826,7 +826,7 @@ cupsdAuthorize(cupsd_client_t *con)	/* I
  
      gss_delete_sec_context(&minor_status, &context, GSS_C_NO_BUFFER);
  
diff --git a/print/cups-base/patches/patch-scheduler_dirsvc.c b/print/cups-base/patches/patch-scheduler_dirsvc.c
index 55fee664fd1..94810be1d18 100644
--- a/print/cups-base/patches/patch-scheduler_dirsvc.c
+++ b/print/cups-base/patches/patch-scheduler_dirsvc.c
@@ -1,11 +1,11 @@
-$NetBSD: patch-scheduler_dirsvc.c,v 1.1 2017/11/12 14:10:15 khorben Exp $
+$NetBSD: patch-scheduler_dirsvc.c,v 1.2 2020/05/26 08:36:56 triaxx Exp $
 
 o net/mDNSResponder-258.14 does not define kDNSServiceErr_Timeout, just threat
  it like kDNSServiceErr_Unknown.
 
 --- scheduler/dirsvc.c.orig	2015-01-30 16:15:53.000000000 +0000
 +++ scheduler/dirsvc.c
-@@ -831,9 +831,6 @@ dnssdErrorString(int error)		/* I - Erro
+@@ -865,9 +865,6 @@ dnssdErrorString(int error)		/* I - Erro
  
      case kDNSServiceErr_PollingMode :
          return ("Service polling mode error.");
diff --git a/print/libcups/Makefile b/print/libcups/Makefile
index 0aba59a9f16..6c617a78e4d 100644
--- a/print/libcups/Makefile
+++ b/print/libcups/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2020/05/22 10:55:50 adam Exp $
+# $NetBSD: Makefile,v 1.4 2020/05/26 08:36:56 triaxx Exp $
 
 .include "../../print/cups/Makefile.common"
 
 PKGNAME=	libcups-${CUPS_VERS}
-PKGREVISION=	2
+PKGREVISION=	3
 MASTER_SITES=	${MASTER_SITE_GITHUB:=apple/}
 
 MAINTAINER=	sbd@NetBSD.org
@@ -40,6 +40,8 @@ CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
 
+BUILD_DEFS+=		VARBASE
+
 # Explicitly disable epoll on illumos, it is provided for Linux compat only.
 CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_create=no
 
@@ -53,7 +55,7 @@ BUILDLINK_TRANSFORM.FreeBSD+=	rm:-Wl,-pie
 PKG_SYSCONFSUBDIR=	cups
 CUPS_CACHE=		${VARBASE}/cache/cups
 
-.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
+.if ${OPSYS} == NetBSD && ${MACHINE_ARCH} == powerpc
 SUBST_CLASSES+=		piefix
 SUBST_FILES.piefix=	Makedefs.in
 SUBST_MESSAGE.piefix=	Removing PIE flags
diff --git a/print/libcups/buildlink3.mk b/print/libcups/buildlink3.mk
index ac0f7300294..cb424b5c114 100644
--- a/print/libcups/buildlink3.mk
+++ b/print/libcups/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2020/05/22 10:55:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2020/05/26 08:36:56 triaxx Exp $
 
 BUILDLINK_TREE+=	libcups
 
@@ -6,21 +6,21 @@ BUILDLINK_TREE+=	libcups
 LIBCUPS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libcups+=	libcups>=1.1.19nb3
-BUILDLINK_ABI_DEPENDS.libcups+=	libcups>=2.3.3nb2
+BUILDLINK_ABI_DEPENDS.libcups+=	libcups>=2.3.3nb3
 BUILDLINK_PKGSRCDIR.libcups?=	../../print/libcups
 
 pkgbase := libcups
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.libcups:Mkerberos)
+.if ${PKG_BUILD_OPTIONS.libcups:Mkerberos}
 .include "../../mk/krb5.buildlink3.mk"
 .endif
 
-.if !empty(PKG_BUILD_OPTIONS.libcups:Mdnssd)
+.if ${PKG_BUILD_OPTIONS.libcups:Mdnssd}
 .include "../../net/mDNSResponder/buildlink3.mk"
 .endif
 
-.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.libcups:Mavahi)
+.if ${OPSYS} != "Darwin" && ${PKG_BUILD_OPTIONS.libcups:Mavahi}
 .include "../../net/avahi/buildlink3.mk"
 .endif