[pkgsrc/trunk]: pkgsrc/print/cups Added avahi as an option so ippfind can be ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/print/cups Added avahi as an option so ippfind can be ...
From: adam <adam%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 06:27:47 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/05833e9a3a84
branches:  trunk
changeset: 356358:05833e9a3a84
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Dec 30 07:08:34 2016 +0000

description:
Added avahi as an option so ippfind can be build; unified PLIST and cleanup for Darwin

diffstat:

 print/cups/Makefile      |   25 +--
 print/cups/PLIST         |   10 +-
 print/cups/PLIST.Darwin  |  372 -----------------------------------------------
 print/cups/buildlink3.mk |    6 +-
 print/cups/options.mk    |   36 +++-
 5 files changed, 46 insertions(+), 403 deletions(-)

diffs (truncated from 602 to 300 lines):

diff -r 69ab5ee22d53 -r 05833e9a3a84 print/cups/Makefile
--- a/print/cups/Makefile       Fri Dec 30 04:48:56 2016 +0000
+++ b/print/cups/Makefile       Fri Dec 30 07:08:34 2016 +0000
@@ -1,24 +1,25 @@
-# $NetBSD: Makefile,v 1.236 2016/12/12 14:26:15 wiz Exp $
+# $NetBSD: Makefile,v 1.237 2016/12/30 07:08:34 adam Exp $
 
 DISTNAME=      cups-2.2.1-source
 PKGNAME=       ${DISTNAME:S/-source//}
 CATEGORIES=    print
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=apple/}
-GITHUB_RELEASE=        v${PKGVERSION_NOREV}
 
 MAINTAINER=    sbd%NetBSD.org@localhost
 HOMEPAGE=      http://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
-USE_LIBTOOL=           yes
+USE_TOOLS+=            aclocal autoconf automake gmake pkg-config
 
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --localedir=${PREFIX}/${PKGLOCALEDIR}/locale
@@ -34,6 +35,7 @@
 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
@@ -55,11 +57,6 @@
 .endif
 LIBS+=                 ${BUILDLINK_LDADD.iconv}
 
-PLIST_VARS+=           notmac
-.if ${OPSYS} != "Darwin"
-PLIST.notmac=          yes
-.endif
-
 # 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
@@ -77,7 +74,7 @@
 FILES_SUBST+=          CUPS_SYSTEM_GROUPS=${CUPS_SYSTEM_GROUPS:Q}
 
 PKG_GROUPS_VARS+=      CUPS_GROUP CUPS_SYSTEM_GROUPS
-PKG_USERS_VARS+=       CUPS_USER
+PKG_USERS_VARS=                CUPS_USER
 
 BUILD_DEFS+=           CUPS_USER CUPS_GROUP CUPS_SYSTEM_GROUPS VARBASE
 
@@ -133,10 +130,6 @@
 SUBST_STAGE.piefix=    post-patch
 .endif
 
-.if ${OPSYS} == "Darwin"
-PLIST_SRC=             PLIST.Darwin
-.endif
-
 INSTALLATION_DIRS=     ${DOCDIR} ${EGDIR} ${MIMEDIR} ${CUPS_CONFDIR}
 INSTALL_ENV+=          DSTROOT=${DESTDIR}
 
@@ -171,9 +164,9 @@
 .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 "../../mk/curses.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.include "../../print/libpaper/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 69ab5ee22d53 -r 05833e9a3a84 print/cups/PLIST
--- a/print/cups/PLIST  Fri Dec 30 04:48:56 2016 +0000
+++ b/print/cups/PLIST  Fri Dec 30 07:08:34 2016 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.57 2016/10/09 08:33:16 leot Exp $
+@comment $NetBSD: PLIST,v 1.58 2016/12/30 07:08:34 adam Exp $
 bin/cancel
 bin/cups-config
 bin/cupstestdsc
 bin/cupstestppd
+${PLIST.ippfind}bin/ippfind
 bin/ipptool
 bin/lp
 bin/lpoptions
@@ -35,6 +36,10 @@
 lib/libcupsimage.la
 lib/libcupsmime.la
 lib/libcupsppdc.la
+${PLIST.apple}libexec/cups/apple/http
+${PLIST.apple}libexec/cups/apple/https
+${PLIST.apple}libexec/cups/apple/ipp
+${PLIST.apple}libexec/cups/apple/ipps
 ${PLIST.dnssd}libexec/cups/backend/dnssd
 libexec/cups/backend/http
 libexec/cups/backend/https
@@ -72,6 +77,7 @@
 man/man1/cups.1
 man/man1/cupstestdsc.1
 man/man1/cupstestppd.1
+${PLIST.ippfind}man/man1/ippfind.1
 man/man1/ipptool.1
 man/man1/lp.1
 man/man1/lpoptions.1
@@ -711,8 +717,8 @@
 share/doc/cups/robots.txt
 share/doc/cups/ru/index.html
 share/examples/cups/cups-files.conf
+${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/cupsd.conf
-${PLIST.pam}share/examples/cups/cups.pam
 share/examples/cups/snmp.conf
 share/locale/ca/cups_ca.po
 share/locale/cs/cups_cs.po
diff -r 69ab5ee22d53 -r 05833e9a3a84 print/cups/PLIST.Darwin
--- a/print/cups/PLIST.Darwin   Fri Dec 30 04:48:56 2016 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,372 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2016/01/03 19:56:18 bsiegert Exp $
-bin/cancel
-bin/cups-config
-bin/cupstestdsc
-bin/cupstestppd
-bin/ippfind
-bin/ipptool
-bin/lp
-bin/lpoptions
-bin/lpq
-bin/lpr
-bin/lprm
-bin/lpstat
-bin/ppdc
-bin/ppdhtml
-bin/ppdi
-bin/ppdmerge
-bin/ppdpo
-include/cups/adminutil.h
-include/cups/array.h
-include/cups/backend.h
-include/cups/cgi.h
-include/cups/cups.h
-include/cups/dir.h
-include/cups/file.h
-include/cups/help-index.h
-include/cups/http.h
-include/cups/ipp.h
-include/cups/language.h
-include/cups/mime.h
-include/cups/ppd.h
-include/cups/ppdc.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/libcupscgi.la
-lib/libcupsimage.la
-lib/libcupsmime.la
-lib/libcupsppdc.la
-libexec/cups/apple/http
-libexec/cups/apple/https
-libexec/cups/apple/ipp
-libexec/cups/apple/ipps
-${PLIST.dnssd}libexec/cups/backend/dnssd
-libexec/cups/backend/http
-libexec/cups/backend/https
-libexec/cups/backend/ipp
-libexec/cups/backend/ipps
-libexec/cups/backend/lpd
-${PLIST.dnssd}libexec/cups/backend/mdns
-libexec/cups/backend/snmp
-libexec/cups/backend/socket
-libexec/cups/backend/usb
-libexec/cups/cgi-bin/admin.cgi
-libexec/cups/cgi-bin/classes.cgi
-libexec/cups/cgi-bin/help.cgi
-libexec/cups/cgi-bin/jobs.cgi
-libexec/cups/cgi-bin/printers.cgi
-libexec/cups/daemon/cups-deviced
-libexec/cups/daemon/cups-driverd
-libexec/cups/daemon/cups-exec
-libexec/cups/daemon/cups-lpd
-libexec/cups/filter/commandtops
-libexec/cups/filter/gziptoany
-libexec/cups/filter/pstops
-libexec/cups/filter/rastertodymo
-libexec/cups/filter/rastertoepson
-libexec/cups/filter/rastertohp
-libexec/cups/filter/rastertolabel
-libexec/cups/filter/rastertopwg
-libexec/cups/monitor/bcp
-libexec/cups/monitor/tbcp
-libexec/cups/notifier/mailto
-libexec/cups/notifier/rss
-man/man1/cancel.1
-man/man1/cups-config.1
-man/man1/cups.1
-man/man1/cupstestdsc.1
-man/man1/cupstestppd.1
-man/man1/ippfind.1
-man/man1/ipptool.1
-man/man1/lp.1
-man/man1/lpoptions.1
-man/man1/lpq.1
-man/man1/lpr.1
-man/man1/lprm.1
-man/man1/lpstat.1
-man/man1/ppdc.1
-man/man1/ppdhtml.1
-man/man1/ppdi.1
-man/man1/ppdmerge.1
-man/man1/ppdpo.1
-man/man5/classes.conf.5
-man/man5/client.conf.5
-man/man5/cups-files.conf.5
-man/man5/cups-snmp.conf.5
-man/man5/cupsd-logs.5
-man/man5/cupsd.conf.5
-man/man5/ipptoolfile.5
-man/man5/mailto.conf.5
-man/man5/mime.convs.5
-man/man5/mime.types.5
-man/man5/ppdcfile.5
-man/man5/printers.conf.5
-man/man5/subscriptions.conf.5
-man/man7/backend.7
-man/man7/filter.7
-man/man7/notifier.7
-man/man8/accept.8
-man/man8/cups-deviced.8
-man/man8/cups-driverd.8
-man/man8/cups-exec.8
-man/man8/cups-lpd.8
-man/man8/cups-snmp.8
-man/man8/cupsaccept.8
-man/man8/cupsaddsmb.8
-man/man8/cupsctl.8
-man/man8/cupsd-helper.8
-man/man8/cupsd.8
-man/man8/cupsdisable.8
-man/man8/cupsenable.8
-man/man8/cupsfilter.8
-man/man8/cupsreject.8
-man/man8/lpadmin.8
-man/man8/lpc.8
-man/man8/lpinfo.8
-man/man8/lpmove.8
-man/man8/reject.8
-sbin/accept
-sbin/cupsaccept
-sbin/cupsaddsmb
-sbin/cupsctl
-sbin/cupsd
-sbin/cupsdisable
-sbin/cupsenable
-sbin/cupsfilter
-sbin/cupsreject
-sbin/lpadmin
-sbin/lpc
-sbin/lpinfo
-sbin/lpmove
-sbin/reject
-share/cups/drv/sample.drv
-share/cups/examples/color.drv
-share/cups/examples/constraint.drv
-share/cups/examples/custom.drv
-share/cups/examples/grouping.drv
-share/cups/examples/laserjet-basic.drv
-share/cups/examples/laserjet-pjl.drv
-share/cups/examples/minimum.drv
-share/cups/examples/postscript.drv
-share/cups/examples/r300-basic.drv
-share/cups/examples/r300-colorman.drv
-share/cups/examples/r300-remote.drv
-share/cups/ipptool/color.jpg
-share/cups/ipptool/create-printer-subscription.test
-share/cups/ipptool/document-a4.pdf
-share/cups/ipptool/document-a4.ps
-share/cups/ipptool/document-letter.pdf
-share/cups/ipptool/document-letter.ps
-share/cups/ipptool/get-completed-jobs.test
-share/cups/ipptool/get-jobs.test
-share/cups/ipptool/get-notifications.test
-share/cups/ipptool/get-printer-attributes.test
-share/cups/ipptool/get-subscriptions.test
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated emulators/qemu to 2.8.0
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/py-html5lib Update to 0.999999999
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated emulators/qemu to 2.8.0
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/py-html5lib Update to 0.999999999
Indexes:
Home | Main Index | Thread Index | Old Index