Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/print Split cups-base in two: libcups and the printer ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/83d0243da772
branches: trunk
changeset: 431837:83d0243da772
user: maya <maya%pkgsrc.org@localhost>
date: Sat May 16 18:07:56 2020 +0000
description:
Split cups-base in two: libcups and the printer daemon.
The intention with this change is to make it easier to enable CUPS support
by default in places, without requiring the daemon (which might conflict
with other printing setups).
Bump cups-base PKGREVISION and make it depend on libcups.
diffstat:
print/Makefile | 3 +-
print/cups-base/Makefile | 10 ++++-
print/cups-base/PLIST | 31 +-----------------
print/cups-base/buildlink3.mk | 3 +-
print/libcups/DESCR | 14 ++++++++
print/libcups/Makefile | 75 +++++++++++++++++++++++++++++++++++++++++++
print/libcups/PLIST | 30 +++++++++++++++++
print/libcups/buildlink3.mk | 33 ++++++++++++++++++
print/libcups/options.mk | 66 +++++++++++++++++++++++++++++++++++++
9 files changed, 231 insertions(+), 34 deletions(-)
diffs (truncated from 358 to 300 lines):
diff -r 69bcacb7dd27 -r 83d0243da772 print/Makefile
--- a/print/Makefile Sat May 16 18:04:33 2020 +0000
+++ b/print/Makefile Sat May 16 18:07:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.769 2020/05/15 11:57:35 nia Exp $
+# $NetBSD: Makefile,v 1.770 2020/05/16 18:07:56 maya Exp $
#
COMMENT= Desktop publishing
@@ -78,6 +78,7 @@
SUBDIR+= latex-mk
SUBDIR+= latexmk
SUBDIR+= lgrind
+SUBDIR+= libcups
SUBDIR+= libgxps
SUBDIR+= libpaper
SUBDIR+= libspectre
diff -r 69bcacb7dd27 -r 83d0243da772 print/cups-base/Makefile
--- a/print/cups-base/Makefile Sat May 16 18:04:33 2020 +0000
+++ b/print/cups-base/Makefile Sat May 16 18:07:56 2020 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2020/05/14 19:45:50 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2020/05/16 18:07:56 maya Exp $
.include "../../print/cups/Makefile.common"
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"
diff -r 69bcacb7dd27 -r 83d0243da772 print/cups-base/PLIST
--- a/print/cups-base/PLIST Sat May 16 18:04:33 2020 +0000
+++ b/print/cups-base/PLIST Sat May 16 18:07:56 2020 +0000
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2019/11/17 21:22:03 leot Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/05/16 18:07:56 maya 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
diff -r 69bcacb7dd27 -r 83d0243da772 print/cups-base/buildlink3.mk
--- a/print/cups-base/buildlink3.mk Sat May 16 18:04:33 2020 +0000
+++ b/print/cups-base/buildlink3.mk Sat May 16 18:07:56 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2020/03/10 22:08:57 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2020/05/16 18:07:56 maya Exp $
BUILDLINK_TREE+= cups-base
@@ -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
diff -r 69bcacb7dd27 -r 83d0243da772 print/libcups/DESCR
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/libcups/DESCR Sat May 16 18:07:56 2020 +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 for talking to CUPS.
diff -r 69bcacb7dd27 -r 83d0243da772 print/libcups/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/libcups/Makefile Sat May 16 18:07:56 2020 +0000
@@ -0,0 +1,75 @@
+# $NetBSD: Makefile,v 1.1 2020/05/16 18:07:56 maya 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"
diff -r 69bcacb7dd27 -r 83d0243da772 print/libcups/PLIST
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/libcups/PLIST Sat May 16 18:07:56 2020 +0000
@@ -0,0 +1,30 @@
+@comment $NetBSD: PLIST,v 1.1 2020/05/16 18:07:56 maya Exp $
+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
diff -r 69bcacb7dd27 -r 83d0243da772 print/libcups/buildlink3.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/libcups/buildlink3.mk Sat May 16 18:07:56 2020 +0000
@@ -0,0 +1,33 @@
+# $NetBSD: buildlink3.mk,v 1.1 2020/05/16 18:07:56 maya 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
diff -r 69bcacb7dd27 -r 83d0243da772 print/libcups/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/print/libcups/options.mk Sat May 16 18:07:56 2020 +0000
@@ -0,0 +1,66 @@
+# $NetBSD: options.mk,v 1.1 2020/05/16 18:07:56 maya Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.libcups
+PKG_SUPPORTED_OPTIONS= acl dnssd kerberos tcpwrappers
+PKG_SUGGESTED_OPTIONS= dnssd kerberos
+
+.if defined(PKG_OPTIONS.cups)
+PKG_LEGACY_OPTIONS+= ${PKG_OPTIONS.cups}
Home |
Main Index |
Thread Index |
Old Index