diff options
author | khorben <khorben@pkgsrc.org> | 2017-11-12 14:10:15 +0000 |
---|---|---|
committer | khorben <khorben@pkgsrc.org> | 2017-11-12 14:10:15 +0000 |
commit | 621a65ddfb8087dda53556ae3775940c75ad9cc8 (patch) | |
tree | cb8760f6fc40223666eaf3a684b29587010c6016 /print | |
parent | d1347e406c56fb378169e7e193a09637dfeb65e4 (diff) | |
download | pkgsrc-621a65ddfb8087dda53556ae3775940c75ad9cc8.tar.gz |
Rename print/cups to print/cups-base to depend on cups-filters
This change:
- renames print/cups to print/cups-base,
- lets print/cups-filters depend on print/cups-base instead of cups,
- adds a package print/cups depending on print/cups-base and
print/cups-filters.
This makes sure installing print/cups always installs
print/cups-filters, as it is necessary for being able to print outside
of Mac OS X since CUPS 1.6.0. You're welcome.
I do not think superseding is necessary, since print/cups will also
install print/cups-base, which really is the same as before. In practice
it is like a new dependency. I do not want to risk a bad "cvs import"
either, sorry.
Bumps PKGREVISION for print/cups and print/cups-filters, since they have
new dependencies now. This is also necessary for everything else currently
depending on print/cups; I will try to commit this right after this one.
Tested on NetBSD/amd64, as reviewed on tech-pkg@.
No breakage observed, apologies if anything goes wrong.
Diffstat (limited to 'print')
-rw-r--r-- | print/cups-base/DESCR | 12 | ||||
-rw-r--r-- | print/cups-base/MESSAGE (renamed from print/cups/MESSAGE) | 2 | ||||
-rw-r--r-- | print/cups-base/MESSAGE.libusb (renamed from print/cups/MESSAGE.libusb) | 2 | ||||
-rw-r--r-- | print/cups-base/MESSAGE.pam (renamed from print/cups/MESSAGE.pam) | 2 | ||||
-rw-r--r-- | print/cups-base/Makefile | 176 | ||||
-rw-r--r-- | print/cups-base/PLIST (renamed from print/cups/PLIST) | 2 | ||||
-rw-r--r-- | print/cups-base/buildlink3.mk | 33 | ||||
-rw-r--r-- | print/cups-base/distinfo (renamed from print/cups/distinfo) | 2 | ||||
-rw-r--r-- | print/cups-base/files/cups.pam (renamed from print/cups/files/cups.pam) | 2 | ||||
-rw-r--r-- | print/cups-base/files/cupsd.sh (renamed from print/cups/files/cupsd.sh) | 2 | ||||
-rw-r--r-- | print/cups-base/options.mk (renamed from print/cups/options.mk) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-ae (renamed from print/cups/patches/patch-ae) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-af (renamed from print/cups/patches/patch-af) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-ai (renamed from print/cups/patches/patch-ai) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-at (renamed from print/cups/patches/patch-at) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-conf-cups-files.conf.in (renamed from print/cups/patches/patch-conf-cups-files.conf.in) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-conf_Makefile (renamed from print/cups/patches/patch-conf_Makefile) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-config-scripts_cups-compiler.m4 (renamed from print/cups/patches/patch-config-scripts_cups-compiler.m4) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-config-scripts_cups-directories.m4 (renamed from print/cups/patches/patch-config-scripts_cups-directories.m4) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 (renamed from print/cups/patches/patch-config-scripts_cups-gssapi.m4) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-config-scripts_cups-libtool.m4 (renamed from print/cups/patches/patch-config-scripts_cups-libtool.m4) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-config-scripts_cups-manpages.m4 (renamed from print/cups/patches/patch-config-scripts_cups-manpages.m4) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-cups-tls.c (renamed from print/cups/patches/patch-cups-tls.c) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-doc-help-man-cups-files.conf.html (renamed from print/cups/patches/patch-doc-help-man-cups-files.conf.html) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-man-cups-files.conf.man.in (renamed from print/cups/patches/patch-man-cups-files.conf.man.in) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-ppdc_Makefile (renamed from print/cups/patches/patch-ppdc_Makefile) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-scheduler-conf.c (renamed from print/cups/patches/patch-scheduler-conf.c) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-scheduler-conf.h (renamed from print/cups/patches/patch-scheduler-conf.h) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-scheduler-main.c (renamed from print/cups/patches/patch-scheduler-main.c) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-scheduler_auth.c (renamed from print/cups/patches/patch-scheduler_auth.c) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-scheduler_dirsvc.c (renamed from print/cups/patches/patch-scheduler_dirsvc.c) | 2 | ||||
-rw-r--r-- | print/cups-base/patches/patch-test_ippfind.c (renamed from print/cups/patches/patch-test_ippfind.c) | 2 | ||||
-rw-r--r-- | print/cups-filters/Makefile | 7 | ||||
-rw-r--r-- | print/cups-filters/buildlink3.mk | 4 | ||||
-rw-r--r-- | print/cups/DESCR | 4 | ||||
-rw-r--r-- | print/cups/Makefile | 176 | ||||
-rw-r--r-- | print/cups/Makefile.common | 11 | ||||
-rw-r--r-- | print/cups/buildlink3.mk | 28 |
38 files changed, 285 insertions, 224 deletions
diff --git a/print/cups-base/DESCR b/print/cups-base/DESCR new file mode 100644 index 00000000000..e967ca79638 --- /dev/null +++ b/print/cups-base/DESCR @@ -0,0 +1,12 @@ +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. diff --git a/print/cups/MESSAGE b/print/cups-base/MESSAGE index d2b50626ef3..143d935fc93 100644 --- a/print/cups/MESSAGE +++ b/print/cups-base/MESSAGE @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.10 2008/12/14 17:17:55 ahoka Exp $ +$NetBSD: MESSAGE,v 1.1 2017/11/12 14:10:15 khorben Exp $ You will need to also install print/ghostscript if you wish to print to non-Postscript printers. diff --git a/print/cups/MESSAGE.libusb b/print/cups-base/MESSAGE.libusb index c64d773139d..22087a17167 100644 --- a/print/cups/MESSAGE.libusb +++ b/print/cups-base/MESSAGE.libusb @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE.libusb,v 1.2 2010/06/10 10:28:35 gdt Exp $ +$NetBSD: MESSAGE.libusb,v 1.1 2017/11/12 14:10:15 khorben Exp $ With cups 1.4 from pkgsrc, USB printing can use libusb in addition to traditional USB printer devices. diff --git a/print/cups/MESSAGE.pam b/print/cups-base/MESSAGE.pam index 6a281171336..05ede723179 100644 --- a/print/cups/MESSAGE.pam +++ b/print/cups-base/MESSAGE.pam @@ -1,5 +1,5 @@ =========================================================================== -$NetBSD: MESSAGE.pam,v 1.2 2002/09/24 12:30:32 wiz Exp $ +$NetBSD: MESSAGE.pam,v 1.1 2017/11/12 14:10:15 khorben Exp $ To authenticate for CUPS using PAM, add the contents of the file: diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile new file mode 100644 index 00000000000..a630e9c6180 --- /dev/null +++ b/print/cups-base/Makefile @@ -0,0 +1,176 @@ +# $NetBSD: Makefile,v 1.1 2017/11/12 14:10:15 khorben Exp $ + +.include "../../print/cups/Makefile.common" + +DISTNAME= cups-${CUPS_VERS}-source +PKGNAME= cups-base-${CUPS_VERS} +CATEGORIES= print +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_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-cups-user=${CUPS_USER} +CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} +CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} +CONFIGURE_ARGS+= --with-exe-file-perm=0755 +CONFIGURE_ARGS+= --enable-libpaper +CONFIGURE_ARGS+= --enable-libtool +CONFIGURE_ARGS+= --enable-ssl +CONFIGURE_ARGS+= --with-manext=bsd +CONFIGURE_ARGS+= --without-bundledir +CONFIGURE_ARGS+= --without-icondir +CONFIGURE_ARGS+= --without-menudir +CONFIGURE_ARGS+= --without-perl +CONFIGURE_ARGS+= --without-php +CONFIGURE_ARGS+= --without-python +CONFIGURE_ARGS+= --without-java +CONFIGURE_ARGS+= --disable-gssapi + +CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} + +.include "../../mk/bsd.prefs.mk" +.include "options.mk" + +.if ${OPSYS} == "SunOS" +LIBS_SSP= -lssp_nonshared -lssp +CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} +# Explicitly disable epoll on illumos, it is provided for Linux compat only. +CONFIGURE_ENV+= ac_cv_func_epoll_create=no +.endif +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 + +# 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} + +PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS +PKG_USERS_VARS= CUPS_USER + +BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE + +DOCDIR= ${PREFIX}/share/doc/cups +EGDIR= ${PREFIX}/share/examples/cups +MIMEDIR= ${PREFIX}/share/cups/mime +PKG_SYSCONFSUBDIR= cups +CUPS_CONFDIR= ${PKG_SYSCONFDIR} +CUPS_LOGDIR= ${VARBASE}/log/cups +CUPS_REQUESTS= ${VARBASE}/spool/cups +CUPS_CACHE= ${VARBASE}/cache/cups +CUPS_STATEDIR= ${VARBASE}/run/cups + +PKG_GROUPS= ${CUPS_GROUP} +PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} +PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user +PKG_SHELL.${CUPS_USER}= ${SH} + +CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf +CONF_FILES+= ${EGDIR}/cups-files.conf ${CUPS_CONFDIR}/cups-files.conf +CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf +RCD_SCRIPTS= cupsd + +OWN_DIRS= ${CUPS_CONFDIR} +OWN_DIRS+= ${CUPS_CONFDIR}/interfaces +OWN_DIRS+= ${CUPS_CONFDIR}/ppd +OWN_DIRS+= ${PREFIX}/libexec/cups/driver +OWN_DIRS+= ${CUPS_LOGDIR} +OWN_DIRS+= ${CUPS_STATEDIR} +OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 +OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710 +OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770 +OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 +OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 + +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKDIR}/cups.pam +SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' +SUBST_STAGE.paths= post-patch + +SUBST_CLASSES+= rpathfix +SUBST_FILES.rpathfix= cups-config.in +SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. +SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' +SUBST_STAGE.rpathfix= post-patch + +.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= post-patch +.endif + +INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} +INSTALL_ENV+= DSTROOT=${DESTDIR} + +pre-configure: +.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) + ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" + exit 1 +.endif + cd ${WRKSRC} && aclocal && autoconf + +post-extract: + ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam + +post-install: + set -e; for file in LICENSE.txt README.md; do \ + ${INSTALL_DATA} ${WRKSRC}/$${file} \ + ${DESTDIR}${DOCDIR}/$${file}; \ + done + ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \ + ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ + ${DESTDIR}${EGDIR}/$${file}; \ + done + ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin +.if !empty(PKG_OPTIONS:Mpam) + ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} +.endif +.if !empty(PKG_OPTIONS:Mdnssd) + ${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns +.endif + +.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 --git a/print/cups/PLIST b/print/cups-base/PLIST index 881142ff67b..14c3de471b4 100644 --- a/print/cups/PLIST +++ b/print/cups-base/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.60 2017/10/23 12:34:54 leot Exp $ +@comment $NetBSD: PLIST,v 1.1 2017/11/12 14:10:15 khorben Exp $ bin/cancel bin/cups-config bin/cupstestdsc diff --git a/print/cups-base/buildlink3.mk b/print/cups-base/buildlink3.mk new file mode 100644 index 00000000000..81fb2ab98c8 --- /dev/null +++ b/print/cups-base/buildlink3.mk @@ -0,0 +1,33 @@ +# $NetBSD: buildlink3.mk,v 1.1 2017/11/12 14:10:15 khorben Exp $ + +BUILDLINK_TREE+= cups-base + +.if !defined(CUPS_BASE_BUILDLINK3_MK) +CUPS_BASE_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.cups-base+= cups-base>=1.1.19nb3 +BUILDLINK_ABI_DEPENDS.cups-base+= cups-base>=2.2.2nb2 +BUILDLINK_PKGSRCDIR.cups-base?= ../../print/cups-base + +pkgbase := cups-base +.include "../../mk/pkg-build-options.mk" + +.if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos) +.include "../../mk/krb5.buildlink3.mk" +.endif + +.if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd) +.include "../../net/mDNSResponder/buildlink3.mk" +.endif + +.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups: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 # CUPS_BASE_BUILDLINK3_MK + +BUILDLINK_TREE+= -cups-base diff --git a/print/cups/distinfo b/print/cups-base/distinfo index 5ded007558c..94b2cb01cd0 100644 --- a/print/cups/distinfo +++ b/print/cups-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.125 2017/10/23 12:34:54 leot Exp $ +$NetBSD: distinfo,v 1.1 2017/11/12 14:10:15 khorben Exp $ SHA1 (cups-2.2.5-source.tar.gz) = b6b1967e0329768708f89b42adb4c6810a77a195 RMD160 (cups-2.2.5-source.tar.gz) = fc69142955bfdf30668598ca2c8dcb553ea8eaee diff --git a/print/cups/files/cups.pam b/print/cups-base/files/cups.pam index 30e5a497ad3..400141302a0 100644 --- a/print/cups/files/cups.pam +++ b/print/cups-base/files/cups.pam @@ -1,4 +1,4 @@ -# $NetBSD: cups.pam,v 1.2 2002/10/20 18:57:38 jlam Exp $ +# $NetBSD: cups.pam,v 1.1 2017/11/12 14:10:15 khorben Exp $ # # PAM configuration for Common UNIX Printing System # diff --git a/print/cups/files/cupsd.sh b/print/cups-base/files/cupsd.sh index ba008f9aae4..9813c142009 100644 --- a/print/cups/files/cupsd.sh +++ b/print/cups-base/files/cupsd.sh @@ -1,6 +1,6 @@ #!@RCD_SCRIPTS_SHELL@ # -# $NetBSD: cupsd.sh,v 1.22 2017/07/27 08:54:26 wiz Exp $ +# $NetBSD: cupsd.sh,v 1.1 2017/11/12 14:10:15 khorben Exp $ # # Common UNIX Printing System daemon # diff --git a/print/cups/options.mk b/print/cups-base/options.mk index ec89e188545..029fdf905ab 100644 --- a/print/cups/options.mk +++ b/print/cups-base/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.21 2017/02/17 23:45:48 wiz Exp $ +# $NetBSD: options.mk,v 1.1 2017/11/12 14:10:15 khorben Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cups PKG_SUPPORTED_OPTIONS= acl dnssd kerberos pam tcpwrappers diff --git a/print/cups/patches/patch-ae b/print/cups-base/patches/patch-ae index c48759d9b41..d8fb5831721 100644 --- a/print/cups/patches/patch-ae +++ b/print/cups-base/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.35 2017/10/23 12:34:54 leot Exp $ +$NetBSD: patch-ae,v 1.1 2017/11/12 14:10:15 khorben Exp $ - Do not pass `-z' option to install(1) - Honor optimization flags. diff --git a/print/cups/patches/patch-af b/print/cups-base/patches/patch-af index dbe225a7d8a..3b35445e41d 100644 --- a/print/cups/patches/patch-af +++ b/print/cups-base/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.24 2016/01/03 19:56:18 bsiegert Exp $ +$NetBSD: patch-af,v 1.1 2017/11/12 14:10:15 khorben Exp $ * Remove unneeded $(LIBTOOL), it's now in $(INSTALL_BIN). diff --git a/print/cups/patches/patch-ai b/print/cups-base/patches/patch-ai index fb499e7d6d4..6b534c7a17d 100644 --- a/print/cups/patches/patch-ai +++ b/print/cups-base/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.20 2014/06/07 07:34:05 wiz Exp $ +$NetBSD: patch-ai,v 1.1 2017/11/12 14:10:15 khorben Exp $ Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS diff --git a/print/cups/patches/patch-at b/print/cups-base/patches/patch-at index 4bd3d4e6ddb..9539a9e4162 100644 --- a/print/cups/patches/patch-at +++ b/print/cups-base/patches/patch-at @@ -1,4 +1,4 @@ -$NetBSD: patch-at,v 1.14 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-at,v 1.1 2017/11/12 14:10:15 khorben Exp $ Don't create directories, do that with OWN_DIRS and OWN_DIRS_PERMS diff --git a/print/cups/patches/patch-conf-cups-files.conf.in b/print/cups-base/patches/patch-conf-cups-files.conf.in index def61eded22..11cd6f27236 100644 --- a/print/cups/patches/patch-conf-cups-files.conf.in +++ b/print/cups-base/patches/patch-conf-cups-files.conf.in @@ -1,4 +1,4 @@ -$NetBSD: patch-conf-cups-files.conf.in,v 1.1 2017/07/27 08:54:26 wiz Exp $ +$NetBSD: patch-conf-cups-files.conf.in,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. diff --git a/print/cups/patches/patch-conf_Makefile b/print/cups-base/patches/patch-conf_Makefile index a6c889b411a..20ce94a3a94 100644 --- a/print/cups/patches/patch-conf_Makefile +++ b/print/cups-base/patches/patch-conf_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-conf_Makefile,v 1.4 2015/09/03 21:15:41 wiz Exp $ +$NetBSD: patch-conf_Makefile,v 1.1 2017/11/12 14:10:15 khorben Exp $ Don't install the config files (leave it up to pkgsrc). diff --git a/print/cups/patches/patch-config-scripts_cups-compiler.m4 b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 index 0b5e74c00f9..c5e0c0d1693 100644 --- a/print/cups/patches/patch-config-scripts_cups-compiler.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-compiler.m4 @@ -1,4 +1,4 @@ -$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.4 2017/09/03 11:30:54 leot Exp $ +$NetBSD: patch-config-scripts_cups-compiler.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $ Some builds of gcc seem to support this for compiling but then fail during linking with undefined reference to `__stack_chk_fail_local' diff --git a/print/cups/patches/patch-config-scripts_cups-directories.m4 b/print/cups-base/patches/patch-config-scripts_cups-directories.m4 index fc2d0350893..404da496380 100644 --- a/print/cups/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.4 2017/09/03 11:30:54 leot Exp $ +$NetBSD: patch-config-scripts_cups-directories.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $ The '$' while loops expand the variables as long as possible so that no references to other variables occur. This is necessary because fontpath diff --git a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 index 600d675f8a5..5056aceff53 100644 --- a/print/cups/patches/patch-config-scripts_cups-gssapi.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-gssapi.m4 @@ -1,4 +1,4 @@ -$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.6 2017/09/03 11:30:54 leot Exp $ +$NetBSD: patch-config-scripts_cups-gssapi.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $ builtin krb5-config in platforms such as solaris do not support the gssapi option, and need an explicit -lgss diff --git a/print/cups/patches/patch-config-scripts_cups-libtool.m4 b/print/cups-base/patches/patch-config-scripts_cups-libtool.m4 index a5fbcd10e74..ac832078edc 100644 --- a/print/cups/patches/patch-config-scripts_cups-libtool.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-libtool.m4 @@ -1,4 +1,4 @@ -$NetBSD: patch-config-scripts_cups-libtool.m4,v 1.1 2017/10/23 12:34:54 leot Exp $ +$NetBSD: patch-config-scripts_cups-libtool.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $ Fix non-portable `==' test(1) operator. diff --git a/print/cups/patches/patch-config-scripts_cups-manpages.m4 b/print/cups-base/patches/patch-config-scripts_cups-manpages.m4 index 43090b38810..590f60c8184 100644 --- a/print/cups/patches/patch-config-scripts_cups-manpages.m4 +++ b/print/cups-base/patches/patch-config-scripts_cups-manpages.m4 @@ -1,4 +1,4 @@ -$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.5 2017/09/03 11:30:54 leot Exp $ +$NetBSD: patch-config-scripts_cups-manpages.m4,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add '--with-manext' configure option. diff --git a/print/cups/patches/patch-cups-tls.c b/print/cups-base/patches/patch-cups-tls.c index f186c1f35cc..226fd58430b 100644 --- a/print/cups/patches/patch-cups-tls.c +++ b/print/cups-base/patches/patch-cups-tls.c @@ -1,4 +1,4 @@ -$NetBSD: patch-cups-tls.c,v 1.2 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-cups-tls.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add missing stub. diff --git a/print/cups/patches/patch-doc-help-man-cups-files.conf.html b/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html index 474c7534df6..6b4bf8ce7e5 100644 --- a/print/cups/patches/patch-doc-help-man-cups-files.conf.html +++ b/print/cups-base/patches/patch-doc-help-man-cups-files.conf.html @@ -1,4 +1,4 @@ -$NetBSD: patch-doc-help-man-cups-files.conf.html,v 1.1 2017/07/27 08:54:26 wiz Exp $ +$NetBSD: patch-doc-help-man-cups-files.conf.html,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. diff --git a/print/cups/patches/patch-man-cups-files.conf.man.in b/print/cups-base/patches/patch-man-cups-files.conf.man.in index bb1fcfb14f1..f9cc37eec03 100644 --- a/print/cups/patches/patch-man-cups-files.conf.man.in +++ b/print/cups-base/patches/patch-man-cups-files.conf.man.in @@ -1,4 +1,4 @@ -$NetBSD: patch-man-cups-files.conf.man.in,v 1.1 2017/07/27 08:54:26 wiz Exp $ +$NetBSD: patch-man-cups-files.conf.man.in,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. diff --git a/print/cups/patches/patch-ppdc_Makefile b/print/cups-base/patches/patch-ppdc_Makefile index fa5b9630884..8cf51dc4acd 100644 --- a/print/cups/patches/patch-ppdc_Makefile +++ b/print/cups-base/patches/patch-ppdc_Makefile @@ -1,4 +1,4 @@ -$NetBSD: patch-ppdc_Makefile,v 1.4 2017/10/23 12:34:54 leot Exp $ +$NetBSD: patch-ppdc_Makefile,v 1.1 2017/11/12 14:10:15 khorben Exp $ --- ppdc/Makefile.orig 2017-10-13 18:22:26.000000000 +0000 +++ ppdc/Makefile diff --git a/print/cups/patches/patch-scheduler-conf.c b/print/cups-base/patches/patch-scheduler-conf.c index b4dff19b6dd..8ec5f6d7ed1 100644 --- a/print/cups/patches/patch-scheduler-conf.c +++ b/print/cups-base/patches/patch-scheduler-conf.c @@ -1,4 +1,4 @@ -$NetBSD: patch-scheduler-conf.c,v 1.1 2017/07/27 08:54:26 wiz Exp $ +$NetBSD: patch-scheduler-conf.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. diff --git a/print/cups/patches/patch-scheduler-conf.h b/print/cups-base/patches/patch-scheduler-conf.h index a01e60bd2a2..da85398f6a0 100644 --- a/print/cups/patches/patch-scheduler-conf.h +++ b/print/cups-base/patches/patch-scheduler-conf.h @@ -1,4 +1,4 @@ -$NetBSD: patch-scheduler-conf.h,v 1.1 2017/07/27 08:54:26 wiz Exp $ +$NetBSD: patch-scheduler-conf.h,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. diff --git a/print/cups/patches/patch-scheduler-main.c b/print/cups-base/patches/patch-scheduler-main.c index 08e1315ef67..a88c1b4ea31 100644 --- a/print/cups/patches/patch-scheduler-main.c +++ b/print/cups-base/patches/patch-scheduler-main.c @@ -1,4 +1,4 @@ -$NetBSD: patch-scheduler-main.c,v 1.3 2017/10/23 12:34:54 leot Exp $ +$NetBSD: patch-scheduler-main.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ Add a PidFile configuration directive to write a PID file. diff --git a/print/cups/patches/patch-scheduler_auth.c b/print/cups-base/patches/patch-scheduler_auth.c index 36110418de5..ef1abcb0e6d 100644 --- a/print/cups/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.5 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-scheduler_auth.c,v 1.1 2017/11/12 14:10:15 khorben 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. diff --git a/print/cups/patches/patch-scheduler_dirsvc.c b/print/cups-base/patches/patch-scheduler_dirsvc.c index d214aa4a45d..55fee664fd1 100644 --- a/print/cups/patches/patch-scheduler_dirsvc.c +++ b/print/cups-base/patches/patch-scheduler_dirsvc.c @@ -1,4 +1,4 @@ -$NetBSD: patch-scheduler_dirsvc.c,v 1.6 2015/12/02 21:14:16 leot Exp $ +$NetBSD: patch-scheduler_dirsvc.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ o net/mDNSResponder-258.14 does not define kDNSServiceErr_Timeout, just threat it like kDNSServiceErr_Unknown. diff --git a/print/cups/patches/patch-test_ippfind.c b/print/cups-base/patches/patch-test_ippfind.c index 3e3f7830168..7e9d35dfa86 100644 --- a/print/cups/patches/patch-test_ippfind.c +++ b/print/cups-base/patches/patch-test_ippfind.c @@ -1,4 +1,4 @@ -$NetBSD: patch-test_ippfind.c,v 1.1 2016/01/03 19:56:18 bsiegert Exp $ +$NetBSD: patch-test_ippfind.c,v 1.1 2017/11/12 14:10:15 khorben Exp $ --- test/ippfind.c.orig 2015-05-19 02:36:15.000000000 +0000 +++ test/ippfind.c diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 41bb39a8b6d..fa522e5a4c5 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2017/10/23 13:07:55 leot Exp $ +# $NetBSD: Makefile,v 1.83 2017/11/12 14:10:15 khorben Exp $ DISTNAME= cups-filters-1.17.9 +PKGREVISION= 1 CATEGORIES= print MASTER_SITES= http://openprinting.org/download/cups-filters/ EXTRACT_SUFX= .tar.xz @@ -79,8 +80,8 @@ post-install: .include "../../graphics/png/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../net/avahi/buildlink3.mk" -BUILDLINK_ABI_DEPENDS.cups+= cups>=1.7.4nb1 -.include "../../print/cups/buildlink3.mk" +BUILDLINK_ABI_DEPENDS.cups-base+= cups-base>=1.7.4nb1 +.include "../../print/cups-base/buildlink3.mk" .include "../../print/ghostscript/buildlink3.mk" .include "../../print/ijs/buildlink3.mk" .include "../../print/poppler-cpp/buildlink3.mk" diff --git a/print/cups-filters/buildlink3.mk b/print/cups-filters/buildlink3.mk index e6fc777164c..6be9ceee324 100644 --- a/print/cups-filters/buildlink3.mk +++ b/print/cups-filters/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/09/03 11:29:10 leot Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2017/11/12 14:10:15 khorben Exp $ BUILDLINK_TREE+= cups-filters @@ -8,7 +8,7 @@ CUPS_FILTERS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.cups-filters+= cups-filters>=1.8.2 BUILDLINK_PKGSRCDIR.cups-filters?= ../../print/cups-filters -.include "../../print/cups/buildlink3.mk" +.include "../../print/cups-base/buildlink3.mk" .endif # CUPS_FILTERS_BUILDLINK3_MK BUILDLINK_TREE+= -cups-filters diff --git a/print/cups/DESCR b/print/cups/DESCR index e967ca79638..15bcaec70d7 100644 --- a/print/cups/DESCR +++ b/print/cups/DESCR @@ -10,3 +10,7 @@ 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 is a meta-package for installing CUPS and the necessary backends, +filters, and other software that is required for using printer drivers +from CUPS 1.6.0 on. diff --git a/print/cups/Makefile b/print/cups/Makefile index 8c5b7ecc02e..9114b51fd90 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,174 +1,16 @@ -# $NetBSD: Makefile,v 1.251 2017/10/23 12:34:54 leot Exp $ +# $NetBSD: Makefile,v 1.252 2017/11/12 14:10:15 khorben Exp $ -DISTNAME= cups-2.2.5-source -PKGNAME= ${DISTNAME:S/-source//} -CATEGORIES= print -MASTER_SITES= ${MASTER_SITE_GITHUB:=apple/} +.include "../../print/cups/Makefile.common" + +PKGNAME= cups-${CUPS_VERS} +PKGREVISION= 1 +MASTER_SITES= # empty MAINTAINER= sbd@NetBSD.org -HOMEPAGE= https://www.cups.org/ COMMENT= Common UNIX Printing System -LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 - -GITHUB_RELEASE= v${PKGVERSION_NOREV} - -CONFLICTS+= LPRng-[0-9]* LPRng-core-[0-9]* - -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} -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-cups-user=${CUPS_USER} -CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} -CONFIGURE_ARGS+= --with-system-groups=${CUPS_SYSTEM_GROUPS:Q} -CONFIGURE_ARGS+= --with-exe-file-perm=0755 -CONFIGURE_ARGS+= --enable-libpaper -CONFIGURE_ARGS+= --enable-libtool -CONFIGURE_ARGS+= --enable-ssl -CONFIGURE_ARGS+= --with-manext=bsd -CONFIGURE_ARGS+= --without-bundledir -CONFIGURE_ARGS+= --without-icondir -CONFIGURE_ARGS+= --without-menudir -CONFIGURE_ARGS+= --without-perl -CONFIGURE_ARGS+= --without-php -CONFIGURE_ARGS+= --without-python -CONFIGURE_ARGS+= --without-java -CONFIGURE_ARGS+= --disable-gssapi - -CONFIGURE_ENV+= DSOFLAGS=${LDFLAGS:M*:Q} - -.include "../../mk/bsd.prefs.mk" -.include "options.mk" - -.if ${OPSYS} == "SunOS" -LIBS_SSP= -lssp_nonshared -lssp -CONFIGURE_ENV+= LIBS_SSP=${LIBS_SSP:M*:Q} -# Explicitly disable epoll on illumos, it is provided for Linux compat only. -CONFIGURE_ENV+= ac_cv_func_epoll_create=no -.endif -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 - -# 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} - -PKG_GROUPS_VARS+= CUPS_GROUP CUPS_SYSTEM_GROUPS -PKG_USERS_VARS= CUPS_USER - -BUILD_DEFS+= CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE - -DOCDIR= ${PREFIX}/share/doc/cups -EGDIR= ${PREFIX}/share/examples/cups -MIMEDIR= ${PREFIX}/share/cups/mime -PKG_SYSCONFSUBDIR= cups -CUPS_CONFDIR= ${PKG_SYSCONFDIR} -CUPS_LOGDIR= ${VARBASE}/log/cups -CUPS_REQUESTS= ${VARBASE}/spool/cups -CUPS_CACHE= ${VARBASE}/cache/cups -CUPS_STATEDIR= ${VARBASE}/run/cups - -PKG_GROUPS= ${CUPS_GROUP} -PKG_USERS= ${CUPS_USER}:${CUPS_GROUP} -PKG_GECOS.${CUPS_USER}= Common UNIX Printing System user -PKG_SHELL.${CUPS_USER}= ${SH} - -CONF_FILES+= ${EGDIR}/cupsd.conf ${CUPS_CONFDIR}/cupsd.conf -CONF_FILES+= ${EGDIR}/cups-files.conf ${CUPS_CONFDIR}/cups-files.conf -CONF_FILES+= ${EGDIR}/snmp.conf ${CUPS_CONFDIR}/snmp.conf -RCD_SCRIPTS= cupsd - -OWN_DIRS= ${CUPS_CONFDIR} -OWN_DIRS+= ${CUPS_CONFDIR}/interfaces -OWN_DIRS+= ${CUPS_CONFDIR}/ppd -OWN_DIRS+= ${PREFIX}/libexec/cups/driver -OWN_DIRS+= ${CUPS_LOGDIR} -OWN_DIRS+= ${CUPS_STATEDIR} -OWN_DIRS_PERMS= ${CUPS_STATEDIR}/certs ${CUPS_USER} ${CUPS_GROUP} 0711 -OWN_DIRS_PERMS+= ${CUPS_CONFDIR}/ssl ${REAL_ROOT_USER} ${CUPS_GROUP} 0700 -OWN_DIRS_PERMS+= ${CUPS_REQUESTS} ${REAL_ROOT_USER} ${CUPS_GROUP} 0710 -OWN_DIRS_PERMS+= ${CUPS_REQUESTS}/tmp ${REAL_ROOT_USER} ${CUPS_GROUP} 1770 -OWN_DIRS_PERMS+= ${CUPS_CACHE} ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 -OWN_DIRS_PERMS+= ${CUPS_CACHE}/rss ${REAL_ROOT_USER} ${CUPS_GROUP} 0775 - -SUBST_CLASSES+= paths -SUBST_FILES.paths= ${WRKDIR}/cups.pam -SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g' -SUBST_STAGE.paths= post-patch - -SUBST_CLASSES+= rpathfix -SUBST_FILES.rpathfix= cups-config.in -SUBST_MESSAGE.rpathfix= Adding rpath to cups-config. -SUBST_SED.rpathfix= -e 's|@EXPORT_LDFLAGS@|${COMPILER_RPATH_FLAG}${PREFIX}/lib|g' -SUBST_STAGE.rpathfix= post-patch - -.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= post-patch -.endif - -INSTALLATION_DIRS= ${DOCDIR} ${EGDIR} ${MIMEDIR} -INSTALL_ENV+= DSTROOT=${DESTDIR} - -pre-configure: -.if !empty(CUPS_SYSTEM_GROUPS:M${CUPS_GROUP}) - ${ERROR_MSG} "CUPS_SYSTEM_GROUPS may not contain the CUPS_GROUP" - exit 1 -.endif - cd ${WRKSRC} && aclocal && autoconf - -post-extract: - ${CP} ${FILESDIR}/cups.pam ${WRKDIR}/cups.pam -post-install: - set -e; for file in LICENSE.txt README.md; do \ - ${INSTALL_DATA} ${WRKSRC}/$${file} \ - ${DESTDIR}${DOCDIR}/$${file}; \ - done - ${RUN} for file in cupsd.conf cups-files.conf snmp.conf ; do \ - ${INSTALL_DATA} ${WRKSRC}/conf/$${file} \ - ${DESTDIR}${EGDIR}/$${file}; \ - done - ${CHMOD} g-w ${DESTDIR}${PREFIX}/libexec/cups/cgi-bin -.if !empty(PKG_OPTIONS:Mpam) - ${INSTALL_DATA} ${WRKDIR}/cups.pam ${DESTDIR}${EGDIR} -.endif -.if !empty(PKG_OPTIONS:Mdnssd) - ${LN} -sf ${DESTDIR}${PREFIX}/libexec/cups/backend/dnssd ${DESTDIR}${PREFIX}/libexec/cups/backend/mdns -.endif +META_PACKAGE= yes -.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 "../../print/cups-base/buildlink3.mk" +.include "../../print/cups-filters/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common new file mode 100644 index 00000000000..7b41544a5f3 --- /dev/null +++ b/print/cups/Makefile.common @@ -0,0 +1,11 @@ +# $NetBSD: Makefile.common,v 1.1 2017/11/12 14:10:15 khorben Exp $ +# +# used by print/cups/Makefile +# used by print/cups-base/Makefile + +CUPS_VERS= 2.2.5 +DISTNAME= cups-${CUPS_VERS}-source +CATEGORIES= print + +HOMEPAGE= https://www.cups.org/ +LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 diff --git a/print/cups/buildlink3.mk b/print/cups/buildlink3.mk index e34158caa46..f81a80de350 100644 --- a/print/cups/buildlink3.mk +++ b/print/cups/buildlink3.mk @@ -1,33 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.39 2017/02/12 06:24:48 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.40 2017/11/12 14:10:15 khorben Exp $ BUILDLINK_TREE+= cups .if !defined(CUPS_BUILDLINK3_MK) CUPS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3 -BUILDLINK_ABI_DEPENDS.cups+= cups>=2.2.2nb2 -BUILDLINK_PKGSRCDIR.cups?= ../../print/cups +BUILDLINK_API_DEPENDS.cups+= cups>=1.1.19nb3 +BUILDLINK_ABI_DEPENDS.cups+= cups>=2.2.2nb2 +BUILDLINK_PKGSRCDIR.cups?= ../../print/cups-base -pkgbase := cups -.include "../../mk/pkg-build-options.mk" - -.if !empty(PKG_BUILD_OPTIONS.cups:Mkerberos) -.include "../../mk/krb5.buildlink3.mk" -.endif - -.if !empty(PKG_BUILD_OPTIONS.cups:Mdnssd) -.include "../../net/mDNSResponder/buildlink3.mk" -.endif - -.if ${OPSYS} != "Darwin" && !empty(PKG_BUILD_OPTIONS.cups: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" +.include "../../print/cups-base/buildlink3.mk" .endif # CUPS_BUILDLINK3_MK BUILDLINK_TREE+= -cups |