Re: Re-enabling cups option in gtk3

To: Greg Troxel <gdt%lexort.com@localhost>
Subject: Re: Re-enabling cups option in gtk3
From: maya%NetBSD.org@localhost
Date: Fri, 15 May 2020 10:24:58 +0000

Splitting libcups into its own package:

Index: print/libcups/DESCR
===================================================================
RCS file: print/libcups/DESCR
diff -N print/libcups/DESCR
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ print/libcups/DESCR	15 May 2020 10:23:44 -0000
@@ -0,0 +1,14 @@
+The Common UNIX Printing System provides a portable printing layer for
+UNIX operating systems. It has been developed by Easy Software Products
+to promote a standard printing solution for all UNIX vendors and users.
+CUPS provides the System V and Berkeley command-line interfaces.
+
+CUPS uses the Internet Printing Protocol (IETF-IPP) as the basis for
+managing print jobs and queues.  The Line Printer Daemon (LPD, RFC1179)
+and AppSocket protocols are also supported with reduced functionality.
+
+CUPS adds network printer browsing and PostScript Printer Description
+("PPD")-based printing options to support real world applications under
+UNIX.
+
+This package consists of the library used to talking to CUPS.
Index: print/libcups/Makefile
===================================================================
RCS file: print/libcups/Makefile
diff -N print/libcups/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ print/libcups/Makefile	15 May 2020 10:23:44 -0000
@@ -0,0 +1,75 @@
+# $NetBSD: Makefile,v 1.31 2020/05/02 11:47:16 leot Exp $
+
+.include "../../print/cups/Makefile.common"
+
+PKGNAME=	libcups-${CUPS_VERS}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=apple/}
+
+MAINTAINER=	sbd%NetBSD.org@localhost
+COMMENT=	Common UNIX Printing System library
+
+DISTINFO_FILE?=	${.CURDIR}/../../print/cups-base/distinfo
+PATCHDIR?=	${.CURDIR}/../../print/cups-base/patches
+
+GITHUB_PROJECT=	cups
+GITHUB_RELEASE=	v${PKGVERSION_NOREV}
+
+CONFLICTS+=	LPRng-[0-9]* LPRng-core-[0-9]*
+
+WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
+UNLIMIT_RESOURCES=	datasize memorysize
+USE_LANGUAGES=		c c++	# pdftops is a C++ application
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+USE_TOOLS+=		aclocal autoconf automake gmake pkg-config
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--with-cachedir=${CUPS_CACHE:Q}
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/cups
+CONFIGURE_ARGS+=	--with-serverbindir=${PREFIX}/libexec/cups
+CONFIGURE_ARGS+=	--with-components=libcups
+CONFIGURE_ARGS+=	--enable-libpaper
+CONFIGURE_ARGS+=	--enable-ssl
+
+CONFIGURE_ENV+=		DSOFLAGS=${LDFLAGS:M*:Q}
+
+.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
+
+# Explicitly disable epoll on illumos, it is provided for Linux compat only.
+CONFIGURE_ENV.SunOS+=	ac_cv_func_epoll_create=no
+
+LIBS+=			${BUILDLINK_LDADD.iconv}
+
+# Avoid the following error when compiling with clang.
+# /usr/local/bin/ld: /usr/lib/crt1.o: relocation R_X86_64_32 against `_DYNAMIC'
+# can not be used when making a shared object; recompile with -fPIC
+BUILDLINK_TRANSFORM.FreeBSD+=	rm:-Wl,-pie
+
+PKG_SYSCONFSUBDIR=	cups
+CUPS_CACHE=		${VARBASE}/cache/cups
+
+.if !empty(OPSYS:MNetBSD) && !empty(MACHINE_ARCH:Mpowerpc)
+SUBST_CLASSES+=		piefix
+SUBST_FILES.piefix=	Makedefs.in
+SUBST_MESSAGE.piefix=	Removing PIE flags
+SUBST_SED.piefix=	-e 's|@PIEFLAGS@||g'
+SUBST_STAGE.piefix=	pre-configure
+.endif
+
+pre-configure:
+	cd ${WRKSRC} && aclocal && autoconf
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/libpaper/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/libunistring/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: print/libcups/PLIST
===================================================================
RCS file: print/libcups/PLIST
diff -N print/libcups/PLIST
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ print/libcups/PLIST	15 May 2020 10:23:44 -0000
@@ -0,0 +1,30 @@
+@comment $NetBSD$
+bin/cups-config
+include/cups/adminutil.h
+include/cups/array.h
+include/cups/backend.h
+include/cups/cups.h
+include/cups/dir.h
+include/cups/file.h
+include/cups/http.h
+include/cups/ipp.h
+include/cups/language.h
+include/cups/ppd.h
+include/cups/pwg.h
+include/cups/raster.h
+include/cups/sidechannel.h
+include/cups/transcode.h
+include/cups/versioning.h
+lib/libcups.la
+lib/libcupsimage.la
+share/locale/ca/cups_ca.po
+share/locale/cs/cups_cs.po
+share/locale/de/cups_de.po
+share/locale/en/cups_en.po
+share/locale/es/cups_es.po
+share/locale/fr/cups_fr.po
+share/locale/it/cups_it.po
+share/locale/ja/cups_ja.po
+share/locale/pt_BR/cups_pt_BR.po
+share/locale/ru/cups_ru.po
+share/locale/zh_CN/cups_zh_CN.po
Index: print/libcups/buildlink3.mk
===================================================================
RCS file: print/libcups/buildlink3.mk
diff -N print/libcups/buildlink3.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ print/libcups/buildlink3.mk	15 May 2020 10:23:44 -0000
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink3.mk,v 1.13 2020/03/10 22:08:57 wiz Exp $
+
+BUILDLINK_TREE+=	libcups
+
+.if !defined(LIBCUPS_BUILDLINK3_MK)
+LIBCUPS_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libcups+=	libcups>=1.1.19nb3
+BUILDLINK_ABI_DEPENDS.libcups+=	libcups>=2.3.1nb3
+BUILDLINK_PKGSRCDIR.libcups?=		../../print/libcups
+
+pkgbase := libcups
+.include "../../mk/pkg-build-options.mk"
+
+.if !empty(PKG_BUILD_OPTIONS.libcups:Mkerberos)
+.include "../../mk/krb5.buildlink3.mk"
+.endif
+
+.if !empty(PKG_BUILD_OPTIONS.libcups:Mdnssd)
+.include "../../net/mDNSResponder/buildlink3.mk"
+.endif
+
+.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.libcups:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../security/gnutls/buildlink3.mk"
+.endif # LIBCUPS_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-libcups
Index: print/libcups/options.mk
===================================================================
RCS file: print/libcups/options.mk
diff -N print/libcups/options.mk
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ print/libcups/options.mk	15 May 2020 10:23:44 -0000
@@ -0,0 +1,66 @@
+# $NetBSD: options.mk,v 1.3 2018/06/25 10:01:51 leot Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cups-base
+PKG_SUPPORTED_OPTIONS=	acl dnssd kerberos tcpwrappers
+PKG_SUGGESTED_OPTIONS=	dnssd kerberos
+
+.if defined(PKG_OPTIONS.cups)
+PKG_LEGACY_OPTIONS+=		${PKG_OPTIONS.cups}
+PKG_OPTIONS_DEPRECATED_WARNINGS+= \
+	"Deprecated variable PKG_OPTIONS.cups used, use ${PKG_OPTIONS_VAR} instead."
+.endif
+
+.if ${OPSYS} != "Darwin"
+# CUPS on Darwin does not support DBus and libusb
+PKG_SUPPORTED_OPTIONS+=	avahi dbus
+PKG_SUGGESTED_OPTIONS+=	dbus
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Macl)
+CONFIGURE_ARGS+=	--enable-acl
+.else
+CONFIGURE_ARGS+=	--disable-acl
+.endif
+
+.if !empty(PKG_OPTIONS:Mavahi)
+.include "../../net/avahi/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-avahi
+.else
+CONFIGURE_ARGS+=	--disable-avahi
+.endif
+
+.if !empty(PKG_OPTIONS:Mdbus)
+.  include "../../sysutils/dbus/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-dbus
+.else
+CONFIGURE_ARGS+=	--disable-dbus
+.endif
+
+.if !empty(PKG_OPTIONS:Mdnssd)
+.include "../../net/mDNSResponder/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-dnssd
+.else
+CONFIGURE_ARGS+=	--disable-dnssd
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.include "../../mk/krb5.buildlink3.mk"
+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 '\%<Policy kerberos>%,\%</Policy>%s/^/\#/'
+SUBST_FILES.nokerb+=	conf/cupsd.conf
+SUBST_MESSAGE.nokerb=	Commenting out kerberos section in config.
+.endif
+
+.if !empty(PKG_OPTIONS:Mtcpwrappers)
+.include "../../security/tcp_wrappers/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-tcp-wrappers
+.else
+CONFIGURE_ARGS+=	--disable-tcp-wrappers
+.endif
Index: print/cups-base/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups-base/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- print/cups-base/Makefile	14 May 2020 19:45:50 -0000	1.33
+++ print/cups-base/Makefile	15 May 2020 10:23:44 -0000
@@ -4,7 +4,7 @@
 
 DISTNAME=	cups-${CUPS_VERS}-source
 PKGNAME=	cups-base-${CUPS_VERS}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=apple/}
 
@@ -137,6 +137,11 @@
 	${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam
 
 post-install:
+	# Delete files installed by libcups
+	${RM} ${DESTDIR}${PREFIX}/bin/cups-config
+	${RM} -rf ${DESTDIR}${PREFIX}/lib
+	${RM} -rf ${DESTDIR}${PREFIX}/include/cups
+	${RM} -rf ${DESTDIR}${PREFIX}/share/locale
 	set -e; for file in LICENSE README.md; do			\
 		${INSTALL_DATA} ${WRKSRC}/$${file}			\
 		     ${DESTDIR}${DOCDIR}/$${file}; \
@@ -157,6 +162,7 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/libcups/buildlink3.mk"
 .include "../../print/libpaper/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .include "../../textproc/libunistring/buildlink3.mk"
Index: print/cups-base/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups-base/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- print/cups-base/PLIST	17 Nov 2019 21:22:03 -0000	1.4
+++ print/cups-base/PLIST	15 May 2020 10:23:44 -0000
@@ -1,6 +1,5 @@
 @comment $NetBSD: PLIST,v 1.4 2019/11/17 21:22:03 leot Exp $
 bin/cancel
-bin/cups-config
 bin/cupstestppd
 bin/ippeveprinter
 ${PLIST.ippfind}bin/ippfind
@@ -16,23 +15,6 @@
 bin/ppdi
 bin/ppdmerge
 bin/ppdpo
-include/cups/adminutil.h
-include/cups/array.h
-include/cups/backend.h
-include/cups/cups.h
-include/cups/dir.h
-include/cups/file.h
-include/cups/http.h
-include/cups/ipp.h
-include/cups/language.h
-include/cups/ppd.h
-include/cups/pwg.h
-include/cups/raster.h
-include/cups/sidechannel.h
-include/cups/transcode.h
-include/cups/versioning.h
-lib/libcups.la
-lib/libcupsimage.la
 ${PLIST.apple}libexec/cups/apple/http
 ${PLIST.apple}libexec/cups/apple/https
 ${PLIST.apple}libexec/cups/apple/ipp
@@ -781,14 +763,3 @@
 ${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/cupsd.conf
 share/examples/cups/snmp.conf
-share/locale/ca/cups_ca.po
-share/locale/cs/cups_cs.po
-share/locale/de/cups_de.po
-share/locale/en/cups_en.po
-share/locale/es/cups_es.po
-share/locale/fr/cups_fr.po
-share/locale/it/cups_it.po
-share/locale/ja/cups_ja.po
-share/locale/pt_BR/cups_pt_BR.po
-share/locale/ru/cups_ru.po
-share/locale/zh_CN/cups_zh_CN.po
Index: print/cups-base/buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/print/cups-base/buildlink3.mk,v
retrieving revision 1.13
diff -u -r1.13 buildlink3.mk
--- print/cups-base/buildlink3.mk	10 Mar 2020 22:08:57 -0000	1.13
+++ print/cups-base/buildlink3.mk	15 May 2020 10:23:44 -0000
@@ -27,6 +27,7 @@
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
+.include "../../print/libcups/buildlink3.mk"
 .include "../../security/gnutls/buildlink3.mk"
 .endif # CUPS_BASE_BUILDLINK3_MK

Follow-Ups:
- Re: Re-enabling cups option in gtk3
  - From: Greg Troxel
- Re: Re-enabling cups option in gtk3
  - From: J. Lewis Muir
- splitting off libcups (was: Re-enabling cups option in gtk3)
  - From: Edgar Fuß

References:
- Re-enabling cups option in gtk3
  - From: coypu
- Re: Re-enabling cups option in gtk3
  - From: Leonardo Taccari
- Re: Re-enabling cups option in gtk3
  - From: Leonardo Taccari
- Re: Re-enabling cups option in gtk3
  - From: nia
- Re: Re-enabling cups option in gtk3
  - From: nia
- Re: Re-enabling cups option in gtk3
  - From: Martin Husemann
- Re: Re-enabling cups option in gtk3
  - From: Greg Troxel
- Re: Re-enabling cups option in gtk3
  - From: David Brownlee
- Re: Re-enabling cups option in gtk3
  - From: Greg Troxel

Prev by Date: Re: PKG_DEVELOPER=yes [Re: CVS commit: pkgsrc/lang/zig]
Next by Date: Re: PKG_DEVELOPER=yes [Re: CVS commit: pkgsrc/lang/zig]
Previous by Thread: Re: Re-enabling cups option in gtk3
Next by Thread: splitting off libcups (was: Re-enabling cups option in gtk3)
Indexes:

Home | Main Index | Thread Index | Old Index