Date: Fri, 11 Mar 2016 11:53:42 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r410825 - in head: . editors/libreoffice editors/libreoffice4 editors/openoffice-4 editors/openoffice-devel emulators/wine emulators/wine-devel games/pythonsudoku graphics/darktable gra... Message-ID: <201603111153.u2BBrgon093783@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Fri Mar 11 11:53:42 2016 New Revision: 410825 URL: https://svnweb.freebsd.org/changeset/ports/410825 Log: Combine print/cups-base, print/cups-client and print/cups-image into print/cups and update it to 2.1.3. Also remove print/cups-pstoraster, improve print/cups-filters, print/foomatic-* and update print/hplip to 3.16.2. Long description: First some background. When you hand a file to cups it sets up a chain of filter programs that converts the file to something a printer understands. Each filter has a cost associated with it and cups tries to find the cheapest chain. Costs used to be configured in such a way that files were first converted to PostScript. This could then be manipulated further (e.g. putting multiple pages on one sheet) before finally being sent to a PostScript printer or another filter like pstoraster which produces a raster format understood by non-PostScript printer drivers. Nowadays most filters have been moved from cups to cups-filters and they have been configured to use PDF as an intermediate format instead of PostScript. Merging of cups-base, cups-client and cups-image into print/cups: - cups-image provides a library to work with the cups raster format. It is only used to implement filters and printer drivers and these only exist in the context of a cups server so there's no need to separate this from cups-base. - cups-client provides a library that allows applications to print via cups. It is possible to use the library to access a remote cups server without running a local cups server, but such a setup is discouraged and the configuration file to set this up has been marked deprecated. It is better to run a local cups server and let that talk to the remote cups server because then you have the benefits of local job queuing in case the remote server is down or busy. Given this and the fact that without filters cups-base is now smaller than it used to be it makes sense to merge the ports. The patch also adds options IPPTOOL, DOCS and NLS which when disabled make the new cups package smaller than the current cups-client package. Merging the ports also prevents problems with options like ZEROCONF being configured differently in both ports. - print/cups was a metaport that depended on cups-base and some filters. There isn't really a need for such a metaport so cups-base can be renamed to cups. The filters can be depended on by printer drivers such as hplip if they need them. Additional changes to the new print/cups: - Clean up the patches. They seem to have been regenerated with post-patch changes included. - Add a patch to prevent intermediate conversion to PDF when a PostScript file is sent to a PostScript printer when cups-filters is installed. - Fix the PAM configuration file. - Add a patch to let the server search /usr/local/share/ppd like on Linux so other ports don't have to add links to it. - Remove ulpt(4) helper scripts. The port uses libusb with ugen(4). - Remove support for mDNSResponder. cups-filters only supports Avahi. - Combine ICONS and XDG_OPEN options into an X11 option to support WITHOUT_X11. - Optionally depend on colord for ICC profile support. - Various smaller changes. Changes to print/cups-filters: - Let the cups_browsed rc.d script depend on cupsd and avahi_daemon instead of LOGIN. - Development of foomatic-filters has been moved to cups-filters so let this port install foomatic related files and add foomatic-filters to CONFLICTS. - Fix location of liblouis tables. - Add patch to fix ICC support. Changes to print/cups-pstoraster: This port is essentially an old version of Ghostscript plus a cups filter. It's no longer developed. This commit removes it and changes existing dependencies to print/cups-filters which depends on print/ghostscript* and includes a gstoraster filter that can handle both PostScript and PDF. Changes to print/foomatic-db*: Remove old MASTER_SITES and dependencies and eliminate PKGNAMEPREFIX. Changes to print/foomatic-filters: Install beh backend with its original name again and add cups-filters to CONFLICTS. Changes to print/hplip: - Stop installing hpijs/foomatic-rip support. This is no longer supported upstream. - Stop installing hpcups PPDs. These are now automatically generated. The bundled PPDs are generated for an older version of cups. - Rename the QT option to X11 to support WITHOUT_X11. - Simplify the patches now that ports are installed in a staging area. - Add a patch to set SO_REUSEPORT (next to SO_REUSEADDR) on the mDNS socket like avahi-daemon does. This fixes Zeroconf support for HP network printers. PR: 207746 Exp-run by: antoine Approved by: portmgr (antoine) Added: head/print/cups/ - copied from r410824, head/print/cups-base/ head/print/cups-filters/files/patch-cupsfilters_colormanager.c (contents, props changed) head/print/cups/files/cups (contents, props changed) head/print/cups/files/patch-conf_mime.convs.in (contents, props changed) head/print/cups/files/patch-scheduler_auth.c - copied, changed from r410814, head/print/cups-base/files/patch-scheduler__auth.c head/print/cups/files/patch-scheduler_cups-driverd.cxx (contents, props changed) head/print/hplip-plugin/files/patch-installPlugin.py (contents, props changed) head/print/hplip/files/patch-protocol-discovery-mdns.c (contents, props changed) head/print/qpdf/files/patch-libqpdf.pc.in (contents, props changed) Deleted: head/print/cups-base/ head/print/cups-client/ head/print/cups-image/ head/print/cups-pstoraster/ head/print/cups/files/patch-conf-Makefile head/print/cups/files/patch-data-Makefile head/print/cups/files/patch-data_cups.pam head/print/cups/files/patch-scheduler_Makefile head/print/cups/files/patch-scheduler__auth.c head/print/cups/files/ulpt-cupsd.conf.in head/print/cups/files/ulpt-cupsd.sh.in head/print/cups/pkg-descr.client head/print/cups/pkg-descr.image head/print/cups/pkg-message head/print/cups/pkg-plist.client head/print/cups/pkg-plist.image head/print/foomatic-filters/files/patch-Makefile.am head/print/foomatic-filters/files/patch-configure.ac head/print/hplip/files/patch-Makefile.in head/print/hplip/files/patch-base__pexpect.py head/print/hplip/files/patch-hplip-plugin head/print/hplip/files/patch-installer__core_install.py Modified: head/MOVED head/UPDATING head/editors/libreoffice/Makefile head/editors/libreoffice4/Makefile head/editors/openoffice-4/Makefile head/editors/openoffice-devel/Makefile head/emulators/wine-devel/Makefile head/emulators/wine/Makefile head/games/pythonsudoku/Makefile head/graphics/darktable/Makefile head/graphics/epdfview/Makefile head/graphics/oyranos/Makefile head/java/openjdk6/Makefile head/java/openjdk7/Makefile head/java/openjdk8/Makefile head/net/freerdp/Makefile head/net/opennx/Makefile head/net/samba36/Makefile head/net/samba41/Makefile head/net/samba42/Makefile head/net/samba43/Makefile head/net/x2goclient/Makefile head/print/Makefile head/print/cups-bjnp/Makefile head/print/cups-cloud-print/Makefile head/print/cups-filters/Makefile head/print/cups-filters/files/cups_browsed.in head/print/cups-filters/files/patch-filter_pdftops.c head/print/cups-filters/pkg-descr head/print/cups-filters/pkg-plist head/print/cups-fxlinuxprint/Makefile head/print/cups-fxlinuxprint/files/patch-Makefile.in head/print/cups-fxlinuxprint/pkg-plist head/print/cups-pdf/Makefile head/print/cups-pk-helper/Makefile head/print/cups-smb-backend/Makefile head/print/cups/Makefile head/print/cups/distinfo head/print/cups/files/cupsd.in head/print/cups/files/patch-configure head/print/cups/pkg-descr head/print/cups/pkg-plist head/print/dymo-cups-drivers/Makefile head/print/epson-inkjet-printer-escpr/Makefile head/print/foo2zjs/Makefile head/print/foomatic-db-engine/Makefile head/print/foomatic-db-engine/distinfo head/print/foomatic-db/Makefile head/print/foomatic-filters/Makefile head/print/foomatic-filters/pkg-plist head/print/ghostscript8-base/Makefile head/print/ghostscript8-base/files/Makefile.drivers_post head/print/ghostscript9-agpl-base/Makefile head/print/ghostscript9-agpl-base/files/Makefile.drivers_post head/print/ghostscript9-base/Makefile head/print/ghostscript9-base/files/Makefile.drivers_post head/print/gtklp/Makefile head/print/gutenprint-base/Makefile head/print/hpijs/Makefile head/print/hplip-plugin/Makefile head/print/hplip-plugin/distinfo head/print/hplip-plugin/files/patch-plugin_install.py head/print/hplip-plugin/pkg-plist head/print/hplip/Makefile head/print/hplip/distinfo head/print/hplip/files/patch-io-hpmud-musb.c head/print/hplip/files/patch-prnt__hpcups__ErnieFilter.cpp head/print/hplip/files/pkg-message.in head/print/hplip/pkg-plist head/print/kde4-print-manager/Makefile head/print/libgnomecups/Makefile head/print/linux-c6-cups-libs/Makefile head/print/linux-f10-cups-libs/Makefile head/print/muttprint/Makefile head/print/openprinting/Makefile head/print/p5-Net-CUPS/Makefile head/print/photoprint/Makefile head/print/py-pycups/Makefile head/print/qpdf/Makefile head/print/qpdfview/Makefile head/print/qt5-printsupport/Makefile head/print/scribus/Makefile head/print/splix/Makefile head/print/system-config-printer/Makefile head/print/xfce4-print/Makefile head/print/xpp/Makefile head/sysutils/cinnamon-control-center/Makefile head/sysutils/cinnamon-settings-daemon/Makefile head/sysutils/gnome-control-center/Makefile head/sysutils/gnome-settings-daemon/Makefile head/www/chromium/Makefile head/www/opera/Makefile head/x11-toolkits/fox14/Makefile head/x11-toolkits/gnustep-gui/Makefile head/x11-toolkits/gtk20/Makefile head/x11-toolkits/gtk30/Makefile head/x11-toolkits/qt4-gui/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Fri Mar 11 11:26:51 2016 (r410824) +++ head/MOVED Fri Mar 11 11:53:42 2016 (r410825) @@ -8227,4 +8227,7 @@ devel/p5-DateTime-Event-SolarTerm|devel/ devel/p5-DateTime-Util-Astro|devel/p5-DateTime-Astro|2016-03-07|Has been part of DateTime-Astro for a long time security/regripperplugins||2016-03-07|Merged into security/regripper textproc/elasticsearch-plugin-marvel2|textproc/elasticsearch2-plugin-marvel|2016-03-10|Rename to match other Elasticsearch 2 plugins -print/cups||2016-03-11|Deleted to be replaced by print/cups-base +print/cups-base|print/cups|2016-03-11|Merged +print/cups-client|print/cups|2016-03-11|Merged +print/cups-image|print/cups|2016-03-11|Merged +print/cups-pstoraster|print/cups-filters|2016-03-11|Obsolete Modified: head/UPDATING ============================================================================== --- head/UPDATING Fri Mar 11 11:26:51 2016 (r410824) +++ head/UPDATING Fri Mar 11 11:53:42 2016 (r410825) @@ -5,6 +5,24 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20160311: + AFFECTS: print/hplip + AUTHOR: tijl@FreeBSD.org + + HPLIP has been updated to verion 3.16.2. As part of the update support + for the hpijs/foomatic-rip filter has been dropped. This has long been + unsupported upstream. If you used this filter with your printer you'll + have to reconfigure it. + +20160311: + AFFECTS: print/cups-base, print/cups-client, print/cups-image + AUTHOR: tijl@FreeBSD.org + + The cups-base, cups-client and cups-image packages have been combined + into one cups package. If you build your own ports the easiest way to + update is to delete these packages first and then build and install + print/cups. + 20160306: AFFECTS: net-mgmt/yaf AUTHOR: pi@FreeBSD.org Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/editors/libreoffice/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,6 +2,7 @@ .include "${.CURDIR}/Makefile.common" +PORTREVISION= 1 MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \ http://dev-www.libreoffice.org/src/:src \ http://dev-www.libreoffice.org/extern/:ext @@ -113,7 +114,7 @@ VERBOSE_DESC= Increase build verbosity WEBDAV_DESC= Enable webdav protocol CUPS_CONFIGURE_ENABLE= cups -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_IMPLIES= GTK2 Modified: head/editors/libreoffice4/Makefile ============================================================================== --- head/editors/libreoffice4/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/editors/libreoffice4/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,7 +2,7 @@ PORTNAME= libreoffice PORTVERSION= 4.3.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= http://download.documentfoundation.org/libreoffice/ \ http://dev-www.libreoffice.org/extern/:ext \ @@ -217,7 +217,7 @@ TEST_DESC= Run all regression tests VERBOSE_DESC= Increase build verbosity WEBDAV_DESC= Enable webdav protocol -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups CUPS_CONFIGURE_ENABLE= cups DEBUG_CONFIGURE_ON= --enable-crashdump --enable-dbgutil --enable-debug Modified: head/editors/openoffice-4/Makefile ============================================================================== --- head/editors/openoffice-4/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/editors/openoffice-4/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= editors java MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ @@ -146,7 +146,7 @@ WIKI_PUBLISHER_DESC= Build and install W CCACHE_DESC= Mimimize compile time of C/C++ programs CUPS_CONFIGURE_ENABLE= cups -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib Modified: head/editors/openoffice-devel/Makefile ============================================================================== --- head/editors/openoffice-devel/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/editors/openoffice-devel/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${SVNREVISION} -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-r${SVNREVISION}/source/ \ @@ -158,7 +158,7 @@ WIKI_PUBLISHER_DESC= Build and install W CCACHE_DESC= Mimimize compile time of C/C++ programs CUPS_CONFIGURE_ENABLE= cups -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups GNOME_CONFIGURE_ENABLE= dbus gconf lockdown GNOME_LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/emulators/wine-devel/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,6 +3,7 @@ PORTNAME= wine DISTVERSION= 1.9.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -64,7 +65,7 @@ GECKO_DESC= Bundle Gecko MSI package for MONO_DESC= Bundle Mono MSI package for Wine CUPS_CONFIGURE_WITH= cups -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups DOSBOX_RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/emulators/wine/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= wine DISTVERSION= 1.8.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -63,7 +63,7 @@ MONO_DESC= Bundle Mono MSI package for W PORTSCOUT= limitw:1,even CUPS_CONFIGURE_WITH= cups -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups DOSBOX_RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox Modified: head/games/pythonsudoku/Makefile ============================================================================== --- head/games/pythonsudoku/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/games/pythonsudoku/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= pythonsudoku PORTVERSION= 0.13 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games python MASTER_SITES= SF/${PORTNAME}/Python%20Sudoku/${PORTVERSION}/ \ SF/nemysisfreebsdp/games/:icons @@ -18,7 +18,7 @@ COMMENT= Text and graphical program to c LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups RUN_DEPENDS= ${PYGAME} \ ${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \ ${PYTHON_PKGNAMEPREFIX}reportlab1>=0:${PORTSDIR}/print/py-reportlab1 Modified: head/graphics/darktable/Makefile ============================================================================== --- head/graphics/darktable/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/graphics/darktable/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,6 +3,7 @@ PORTNAME= darktable PORTVERSION= 2.0.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/ @@ -86,7 +87,7 @@ OPENEXR_CMAKE_OFF= -DUSE_OPENEXR:BOOL=OF OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CMAKE_OFF= -DUSE_OPENJPEG:BOOL=OFF -PRINT_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +PRINT_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups PRINT_CMAKE_OFF= -DBUILD_PRINT:BOOL=OFF RAWSPEED_CMAKE_OFF= -DDONT_USE_RAWSPEED:BOOL=ON Modified: head/graphics/epdfview/Makefile ============================================================================== --- head/graphics/epdfview/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/graphics/epdfview/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= epdfview PORTVERSION= 0.1.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics print gnome MASTER_SITES= FRUGALWARE/xapps-extra/${PORTNAME} \ ftp://ftp.slackware.com/.1/blfs/conglomeration/${PORTNAME}/ \ @@ -29,7 +29,7 @@ OPTIONS_DEFINE= CUPS NLS OPTIONS_SUB= yes CUPS_CONFIGURE_WITH= cups -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups NLS_USES= gettext NLS_CPPFLAGS= -I${LOCALBASE}/include Modified: head/graphics/oyranos/Makefile ============================================================================== --- head/graphics/oyranos/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/graphics/oyranos/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,7 +2,7 @@ PORTNAME= oyranos PORTVERSION= 0.9.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/Oyranos/Oyranos%20${PORTVERSION:C|(.*)\.[0-9]*$|\1|} @@ -18,7 +18,7 @@ LIB_DEPENDS= libraw.so:${PORTSDIR}/graph libcairo.so:${PORTSDIR}/graphics/cairo \ libyajl.so:${PORTSDIR}/devel/yajl \ libfltk.so:${PORTSDIR}/x11-toolkits/fltk \ - libcups.so:${PORTSDIR}/print/cups-client \ + libcups.so:${PORTSDIR}/print/cups \ libxdot.so:${PORTSDIR}/graphics/graphviz \ liblcms.so:${PORTSDIR}/graphics/lcms \ liblcms2.so:${PORTSDIR}/graphics/lcms2 \ Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/java/openjdk6/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -22,7 +22,7 @@ LICENSE_DISTFILES= ${DISTNAME}${EXTRACT_ BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ - ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client + ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ dejavu>0:${PORTSDIR}/x11-fonts/dejavu Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/java/openjdk7/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -74,7 +74,7 @@ LIB_DEPENDS+= libasound.so:${PORTSDIR}/a libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip \ - ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client + ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups RUN_DEPENDS+= javavm:${PORTSDIR}/java/javavmwrapper \ dejavu>0:${PORTSDIR}/x11-fonts/dejavu Modified: head/java/openjdk8/Makefile ============================================================================== --- head/java/openjdk8/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/java/openjdk8/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -29,7 +29,7 @@ COMMENT?= Java Development Kit ${JDK_MAJ LICENSE= GPLv2 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ - ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client \ + ${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ Modified: head/net/freerdp/Makefile ============================================================================== --- head/net/freerdp/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/freerdp/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= freerdp PORTVERSION= 1.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net comms ipv6 MAINTAINER= ports@FreeBSD.org @@ -33,7 +33,7 @@ ALSA_LIB_DEPENDS= libasound.so:${PORTSDI ALSA_CMAKE_ON= -DWITH_ALSA=ON ALSA_CMAKE_OFF= -DWITH_ALSA=OFF -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups CUPS_CMAKE_ON= -DWITH_CUPS=ON CUPS_CMAKE_OFF= -DWITH_CUPS=OFF Modified: head/net/opennx/Makefile ============================================================================== --- head/net/opennx/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/opennx/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= opennx PORTVERSION= 0.16.0.729 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/CI-source @@ -13,10 +13,9 @@ COMMENT= Open source drop in replacement LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \ - cups-base>0:${PORTSDIR}/print/cups-base -RUN_DEPENDS= cups-base>0:${PORTSDIR}/print/cups-base -LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ +BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups \ + libcurl.so:${PORTSDIR}/ftp/curl \ libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient WRKSRC= ${WRKDIR}/${PORTNAME}-0.16 Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/samba36/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,7 +2,7 @@ PORTNAME= ${SAMBA_BASENAME}36 PORTVERSION= 3.6.25 -PORTREVISION?= 2 +PORTREVISION?= 3 CATEGORIES?= net MASTER_SITES= SAMBA/samba SAMBA/samba/stable SAMBA/samba/pre DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} @@ -195,7 +195,7 @@ SAMBA_WANT_LDAP= yes .endif .if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint SUB_LIST+= CUPS="" .else Modified: head/net/samba41/Makefile ============================================================================== --- head/net/samba41/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/samba41/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}41 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -273,7 +273,7 @@ CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint Modified: head/net/samba42/Makefile ============================================================================== --- head/net/samba42/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/samba42/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}42 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -279,7 +279,7 @@ CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint Modified: head/net/samba43/Makefile ============================================================================== --- head/net/samba43/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/samba43/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}43 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -275,7 +275,7 @@ CONFIGURE_ARGS+= --disable-dnssd .endif .if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups CONFIGURE_ARGS+= --enable-cups --enable-iprint .else CONFIGURE_ARGS+= --disable-cups --disable-iprint Modified: head/net/x2goclient/Makefile ============================================================================== --- head/net/x2goclient/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/net/x2goclient/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,6 +3,7 @@ PORTNAME= x2goclient PORTVERSION= 4.0.5.0 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/ @@ -14,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING # Avoid clash with libssh from base BUILD_DEPENDS= ${LOCALBASE}/lib/libssh.so:${PORTSDIR}/security/libssh -LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \ +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups \ libssh.so:${PORTSDIR}/security/libssh RUN_DEPENDS= nxproxy:${PORTSDIR}/net/nxproxy \ x2goclient-cli:${PORTSDIR}/net/x2goclient-cli Modified: head/print/Makefile ============================================================================== --- head/print/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -23,16 +23,13 @@ SUBDIR += catdvi SUBDIR += cdlabelgen SUBDIR += cloudprint - SUBDIR += cups-base + SUBDIR += cups SUBDIR += cups-bjnp - SUBDIR += cups-client SUBDIR += cups-cloud-print SUBDIR += cups-filters SUBDIR += cups-fxlinuxprint - SUBDIR += cups-image SUBDIR += cups-pdf SUBDIR += cups-pk-helper - SUBDIR += cups-pstoraster SUBDIR += cups-smb-backend SUBDIR += deforaos-pdfviewer SUBDIR += detex Modified: head/print/cups-bjnp/Makefile ============================================================================== --- head/print/cups-bjnp/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-bjnp/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,14 +2,14 @@ PORTNAME= cups-bjnp PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF MAINTAINER= danilo@FreeBSD.org COMMENT= CUPS backend for Canon USB over IP protocol -LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client -BUILD_DEPENDS= ${LOCALBASE}/libexec/cups/backend:${PORTSDIR}/print/cups-base +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups GNU_CONFIGURE= yes # Just to avoid a tautological pointer compare in bjnp-commands.c:187 Modified: head/print/cups-cloud-print/Makefile ============================================================================== --- head/print/cups-cloud-print/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-cloud-print/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,7 +2,7 @@ PORTNAME= cups-cloud-print PORTVERSION= 20140814.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MAINTAINER= ports@FreeBSD.org @@ -11,8 +11,8 @@ COMMENT= Print using Google Cloud Print LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= cups-config:${PORTSDIR}/print/cups-client -RUN_DEPENDS= cancel:${PORTSDIR}/print/cups-base \ +BUILD_DEPENDS= cups-config:${PORTSDIR}/print/cups +RUN_DEPENDS= cancel:${PORTSDIR}/print/cups \ ${PYTHON_PKGNAMEPREFIX}pycups>0:${PORTSDIR}/print/py-pycups \ bash:${PORTSDIR}/shells/bash \ ${PYTHON_PKGNAMEPREFIX}httplib2>0:${PORTSDIR}/www/py-httplib2 Modified: head/print/cups-filters/Makefile ============================================================================== --- head/print/cups-filters/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-filters/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,6 +2,7 @@ PORTNAME= cups-filters PORTVERSION= 1.8.2 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://www.openprinting.org/download/cups-filters/ @@ -16,12 +17,13 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/grap liblcms2.so:${PORTSDIR}/graphics/lcms2 \ libqpdf.so:${PORTSDIR}/print/qpdf \ libdbus-1.so:${PORTSDIR}/devel/dbus \ - libcups.so:${PORTSDIR}/print/cups-client \ - libcupsimage.so:${PORTSDIR}/print/cups-image \ + libcupsimage.so:${PORTSDIR}/print/cups \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libpoppler.so:${PORTSDIR}/graphics/poppler +CONFLICTS= cups-pstoraster-[0-9]* foomatic-filters-[0-9]* + USES= compiler:c++11-lib cpe ghostscript gmake jpeg libtool pathfix \ pkgconfig shebangfix tar:xz CPE_VENDOR= linuxfoundation @@ -34,36 +36,30 @@ SHEBANG_FILES= filter/braille/drivers/ge USE_GNOME= glib20 USE_RC_SUBR= cups_browsed GNU_CONFIGURE= yes -CUPS_SOCKET?= /var/run/cups.sock -CONFIGURE_ARGS= --with-cups-domainsocket=${CUPS_SOCKET} -CONFIGURE_ENV= ZLIB_CFLAGS="-I/usr/include" ZLIB_LIBS="-lz" \ - LIBQPDF_CFLAGS="-I${LOCALBASE}/include" LIBQPDF_LIBS="-lqpdf" +CONFIGURE_ARGS= ZLIB_CFLAGS=" " ZLIB_LIBS="-lz" INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LIBS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes -OPTIONS_DEFINE= AVAHI +OPTIONS_DEFINE= AVAHI DOCS +OPTIONS_DEFAULT=AVAHI AVAHI_CONFIGURE_ENABLE= avahi AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app +AVAHI_SUB_LIST= AVAHI_DAEMON=avahi_daemon +AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= post-patch: @${REINPLACE_CMD} 's:-std=c++0x:-std=c++11:' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/filter/pdftops.c - -post-configure: - @${REINPLACE_CMD} \ - -e 's|\(BANNERTOPDF_DATADIR = \).*\(/share/cups/data\)|\1${PREFIX}\2|' \ - -e 's|\(CUPS_DATADIR = \).*\(/share/cups\)|\1${PREFIX}\2|' \ - -e 's|\(CUPS_SERVERBIN = \).*\(/libexec/cups\)|\1${PREFIX}\2|' \ - -e 's|\(CUPS_SERVERROOT = \).*\(/etc/cups\)|\1${PREFIX}\2|' \ - ${WRKSRC}/Makefile - -post-install: - @${RM} -rf ${STAGEDIR}${PREFIX}/libexec/cups/filter/foomatic-rip \ - ${STAGEDIR}${PREFIX}/bin/foomatic-rip \ - ${STAGEDIR}${PREFIX}/man/man1/foomatic-rip.1 + @${REINPLACE_CMD} 's|/usr/share/liblouis|${LOCALBASE}/share/liblouis|' \ + ${WRKSRC}/configure + @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/filter/pdftops.c + @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ + -e 's|README.gz|README|' \ + ${WRKSRC}/utils/cups-browsed.8 \ + ${WRKSRC}/utils/cups-browsed.conf.5 .include <bsd.port.mk> Modified: head/print/cups-filters/files/cups_browsed.in ============================================================================== --- head/print/cups-filters/files/cups_browsed.in Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-filters/files/cups_browsed.in Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ # $FreeBSD$ # # PROVIDE: cups_browsed -# REQUIRE: LOGIN +# REQUIRE: cupsd %%AVAHI_DAEMON%% # KEYWORD: shutdown # # Add the following to /etc/rc.conf[.local] to enable this service Added: head/print/cups-filters/files/patch-cupsfilters_colormanager.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups-filters/files/patch-cupsfilters_colormanager.c Fri Mar 11 11:53:42 2016 (r410825) @@ -0,0 +1,19 @@ +--- cupsfilters/colormanager.c.orig 2015-06-26 15:45:26 UTC ++++ cupsfilters/colormanager.c +@@ -26,6 +26,7 @@ MIT Open Source License - http://www.o + */ + + ++#include <config.h> + #include "colormanager.h" + #include <cupsfilters/colord.h> + //#include <cupsfilters/kmdevices.h> +@@ -323,7 +324,7 @@ _get_ppd_icc_fallback (ppd_file_t *ppd, + /* expand to a full path if not already specified */ + if (attr->value[0] != '/') + snprintf(full_path, sizeof(full_path), +- "%s/profiles/%s", CUPSDATA, attr->value); ++ "%s/profiles/%s", CUPS_DATADIR, attr->value); + else + strncpy(full_path, attr->value, sizeof(full_path)); + Modified: head/print/cups-filters/files/patch-filter_pdftops.c ============================================================================== --- head/print/cups-filters/files/patch-filter_pdftops.c Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-filters/files/patch-filter_pdftops.c Fri Mar 11 11:53:42 2016 (r410825) @@ -1,6 +1,6 @@ ---- filter/pdftops.c.orig 2015-07-04 11:21:47 UTC +--- filter/pdftops.c.orig 2016-01-19 22:12:43 UTC +++ filter/pdftops.c -@@ -535,7 +535,7 @@ main(int argc, /* I - Number of comm +@@ -532,12 +532,12 @@ main(int argc, /* I - Number of comm if (renderer == PDFTOPS) { @@ -9,3 +9,25 @@ pdf_argc = 1; } else if (renderer == GS) + { +- pdf_argv[0] = (char *)"gs"; ++ pdf_argv[0] = (char *)"%%LOCALBASE%%/bin/gs"; + pdf_argv[1] = (char *)"-q"; + pdf_argv[2] = (char *)"-dNOPAUSE"; + pdf_argv[3] = (char *)"-dBATCH"; +@@ -552,13 +552,13 @@ main(int argc, /* I - Number of comm + } + else if (renderer == PDFTOCAIRO) + { +- pdf_argv[0] = (char *)"pdftocairo"; ++ pdf_argv[0] = (char *)"%%LOCALBASE%%/bin/pdftocairo"; + pdf_argv[1] = (char *)"-ps"; + pdf_argc = 2; + } + else + { +- pdf_argv[0] = (char *)"acroread"; ++ pdf_argv[0] = (char *)"%%LOCALBASE%%/bin/acroread"; + pdf_argv[1] = (char *)"-toPostScript"; + pdf_argc = 2; + } Modified: head/print/cups-filters/pkg-descr ============================================================================== --- head/print/cups-filters/pkg-descr Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-filters/pkg-descr Fri Mar 11 11:53:42 2016 (r410825) @@ -2,4 +2,4 @@ The CUPS Filters package contains backen software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc. -WWW: http://www.linuxfromscratch.org/blfs/view/svn/pst/cups-filters.html +WWW: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters Modified: head/print/cups-filters/pkg-plist ============================================================================== --- head/print/cups-filters/pkg-plist Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-filters/pkg-plist Fri Mar 11 11:53:42 2016 (r410825) @@ -1,3 +1,4 @@ +bin/foomatic-rip bin/ttfread etc/cups/cups-browsed.conf etc/fonts/conf.d/99pdftoopvp.conf @@ -29,6 +30,7 @@ libexec/cups/filter/bannertopdf libexec/cups/filter/brftoembosser libexec/cups/filter/commandtoescpx libexec/cups/filter/commandtopclx +libexec/cups/filter/foomatic-rip libexec/cups/filter/gstopxl libexec/cups/filter/gstoraster libexec/cups/filter/imagetobrf @@ -55,6 +57,7 @@ libexec/cups/filter/texttobrf libexec/cups/filter/texttopdf libexec/cups/filter/texttops libexec/cups/filter/urftopdf +man/man1/foomatic-rip.1.gz man/man5/cups-browsed.conf.5.gz man/man8/cups-browsed.8.gz sbin/cups-browsed @@ -105,11 +108,11 @@ share/cups/ppdc/liblouis3.defs share/cups/ppdc/liblouis4.defs share/cups/ppdc/media-braille.defs share/cups/ppdc/pcl.h -%%DOCSDIR%%/AUTHORS -%%DOCSDIR%%/COPYING -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/AUTHORS +%%PORTDOCS%%%%DOCSDIR%%/COPYING +%%PORTDOCS%%%%DOCSDIR%%/INSTALL +%%PORTDOCS%%%%DOCSDIR%%/NEWS +%%PORTDOCS%%%%DOCSDIR%%/README share/ppd/cupsfilters/Fuji_Xerox-DocuPrint_CM305_df-PDF.ppd share/ppd/cupsfilters/Generic-PDF_Printer-PDF.ppd share/ppd/cupsfilters/HP-Color_LaserJet_CM3530_MFP-PDF.ppd Modified: head/print/cups-fxlinuxprint/Makefile ============================================================================== --- head/print/cups-fxlinuxprint/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-fxlinuxprint/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,7 +2,7 @@ PORTNAME= fxlinuxprint PORTVERSION= 1.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ftp://download.fujixerox.co.jp/pub/exe/apeosport/c4300series/ PKGNAMEPREFIX= cups- @@ -13,7 +13,7 @@ COMMENT= Fuji Xerox Printer Driver LICENSE= GPLv2 -LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups USES= dos2unix ghostscript:run DOS2UNIX_FILES= fxlinuxprint.ppd Modified: head/print/cups-fxlinuxprint/files/patch-Makefile.in ============================================================================== --- head/print/cups-fxlinuxprint/files/patch-Makefile.in Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-fxlinuxprint/files/patch-Makefile.in Fri Mar 11 11:53:42 2016 (r410825) @@ -9,7 +9,7 @@ -cupsmimedir = /etc/cups +cupsfilterdir = @libexecdir@/cups/filter +cupsppddir = @datadir@/cups/model/FujiXerox/en -+cupsmimedir = @sysconfdir@/cups ++cupsmimedir = @datadir@/cups/mime EXTRA_DIST = fxlinuxprint.ppd mimefx.types mimefx.convs cupsppd_DATA = fxlinuxprint.ppd cupsmime_DATA = mimefx.types mimefx.convs Modified: head/print/cups-fxlinuxprint/pkg-plist ============================================================================== --- head/print/cups-fxlinuxprint/pkg-plist Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-fxlinuxprint/pkg-plist Fri Mar 11 11:53:42 2016 (r410825) @@ -1,6 +1,6 @@ -etc/cups/mimefx.convs -etc/cups/mimefx.types libexec/cups/filter/pdftopdffx libexec/cups/filter/pdftopjlfx libexec/cups/filter/pstopdffx +share/cups/mime/mimefx.convs +share/cups/mime/mimefx.types share/cups/model/FujiXerox/en/fxlinuxprint.ppd Modified: head/print/cups-pdf/Makefile ============================================================================== --- head/print/cups-pdf/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-pdf/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= cups-pdf PORTVERSION= 2.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= http://www.cups-pdf.de/src/ \ http://www.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/ @@ -15,7 +15,7 @@ COMMENT= Virtual printer for CUPS to pro LICENSE=GPLv2 LICENSE_FILE=${WRKSRC}/COPYING -RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base +RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/print/cups-pk-helper/Makefile ============================================================================== --- head/print/cups-pk-helper/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-pk-helper/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -4,13 +4,14 @@ PORTNAME= cups-pk-helper PORTVERSION= 0.2.5 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/releases/ MAINTAINER= gnome@FreeBSD.org COMMENT= Helper that makes system-config-printer use PolicyKit -LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client \ +LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit USE_GNOME= glib20 intltool Modified: head/print/cups-smb-backend/Makefile ============================================================================== --- head/print/cups-smb-backend/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups-smb-backend/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -3,7 +3,7 @@ PORTNAME= cups-smb-backend PORTVERSION= 1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= print MASTER_SITES= # empty DISTFILES= # empty @@ -12,7 +12,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= CUPS backend for printing to Windows servers RUN_DEPENDS= smbspool:${PORTSDIR}/net/${SAMBA_PORT} \ - ${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups-base + ${LOCALBASE}/sbin/cupsd:${PORTSDIR}/print/cups NO_BUILD= yes PLIST_FILES= libexec/cups/backend/smb Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups-base/Makefile Fri Mar 11 11:26:51 2016 (r410824) +++ head/print/cups/Makefile Fri Mar 11 11:53:42 2016 (r410825) @@ -2,316 +2,120 @@ # $FreeBSD$ PORTNAME= cups -PORTVERSION= 2.0.3 -DISTVERSIONSUFFIX= -source -#PORTREVISION= defined further +PORTVERSION= 2.1.3 +DISTVERSIONSUFFIX=-source CATEGORIES= print -MASTER_SITES= http://www.cups.org/software/${DISTVERSION}/ \ - EASYSW/${PORTNAME}/${DISTVERSION} -PKGNAMESUFFIX= ${CUPS_SUFFIX}${PKGNAMESUFFIX2} +MASTER_SITES= http://www.cups.org/software/${PORTVERSION}/ -MAINTAINER= ports@FreeBSD.org -COMMENT= Common UNIX Printing System: ${COMMENT2} +MAINTAINER= tijl@FreeBSD.org +COMMENT= Common UNIX Printing System -LICENSE= GPLv2 +LICENSE= GPLv2 LGPL20 +LICENSE_COMB= multi +LICENSE_FILE_GPLv2= ${WRKSRC}/LICENSE.txt +LICENSE_FILE_LGPL20= ${WRKSRC}/LICENSE.txt -LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \ - libgcrypt.so:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls CONFLICTS= LPRng-[0-9]* -USES+= cpe gmake iconv pkgconfig tar:bzip2 -CPE_VENDOR= apple DESTDIRNAME= DSTROOT GNU_CONFIGURE= yes -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -DSOFLAGS= -Wl,-rpath,${PREFIX}/lib ${LDFLAGS} ${LIBS} -CONFIGURE_ENV= DSOFLAGS="${DSOFLAGS}" -CONFIGURE_ARGS+= --localstatedir=/var \ - --disable-gssapi \ - --with-cups-user=${USERS} \ - --with-cups-group=${GROUPS} \ - --with-system-groups=${CUPSSYSGRP} \ - --with-docdir=${DOCSDIR} \ - --with-menudir=${DESKTOPDIR} \ - --with-domainsocket=${CUPS_SOCKET} \ - --with-cachedir=${CUPS_CACHEDIR} \ - --with-pam-module="unix" \ - --enable-gnutls - -CUPS_CACHEDIR?= /var/db/cups -CUPS_SPOOLDIR= /var/spool/cups -CUPS_SOCKET?= /var/run/cups.sock -CUPS_PDFTOPS?= ${LOCALBASE}/libexec/xpdf/pdftops -WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} - -CUPSSYSGRP= wheel -# GROUPS/USERS does not work here -GROUPS= cups +CONFIGURE_ARGS= --disable-dnssd \ + --disable-gssapi \ + --disable-launchd \ + --disable-systemd \ + --enable-gnutls \ + --with-cups-user=${USERS} \ + --with-cups-group=${GROUPS} \ + --with-system-groups=wheel \ + --with-dbusdir="${PREFIX}/etc/dbus-1" \ + --with-icondir="${PREFIX}/share/icons" \ + --with-menudir="${DESKTOPDIR}" \ + --with-printcap="${PREFIX}/etc/printcap" \ + --with-rcdir=no \ + --with-optim=" " \ + --with-pam-module="unix" \ + ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI= \ + ac_cv_path_PHP= ac_cv_path_PYTHON= +LIBS+= -L${LOCALBASE}/lib +USES= cpe gmake iconv pkgconfig tar:bzip2 +CPE_VENDOR= apple +USE_LDCONFIG= yes +USE_RC_SUBR= cupsd +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} + +GROUPS= cups USERS= cups +OPTIONS_DEFINE= AVAHI DBUS DOCS IPPTOOL LIBPAPER NLS X11 +OPTIONS_DEFAULT= AVAHI DBUS LIBPAPER OPTIONS_SUB= yes -.if defined(CUPS_CLIENT) -PORTREVISION= 2 -LICENSE= LGPL21 -CUPS_SUFFIX= -client -OPTIONS_RADIO= ZEROCONF -OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER -OPTIONS_DEFAULT+= MDNSRESPONDER -.elif defined(CUPS_IMAGE) -PORTREVISION= 2 -CUPS_SUFFIX= -image -LICENSE= LGPL21 -.else -PORTREVISION= 5 -CUPS_SUFFIX= -base -# No DOCS option. Files are needed by web interface. -OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN -OPTIONS_GROUP= WEB -OPTIONS_GROUP_WEB= JAVA PERL PHP PYTHON -OPTIONS_RADIO= ZEROCONF -OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER -OPTIONS_DEFAULT+= LIBPAPER MDNSRESPONDER ICONS -.endif -ICONS_DESC= Desktop icons -LIBUSB_DESC= USB support -WEB_DESC= Interpreters for web interfaces -XDG_OPEN_DESC= Build with XDG_OPEN as browser -ZEROCONF_DESC= Zeroconf support - -.include <bsd.port.options.mk> - -.if defined(CUPS_CLIENT) -COMMENT2= Library cups -INSTALL_WRKSRC= ${WRKSRC}/cups -PLIST= ${MASTERDIR}/pkg-plist.client -LIBS+= ${ICONV_LIB} -USE_LDCONFIG= yes -PKGMESSAGE= ${NONEXISTENT} -DESCR= ${MASTERDIR}/pkg-descr.client -.elif defined(CUPS_IMAGE) -LIB_DEPENDS+= libcups.so:${PORTSDIR}/${PKGCATEGORY}/cups-client \ - libpng.so:${PORTSDIR}/graphics/png \ - libtiff.so:${PORTSDIR}/graphics/tiff -# force build if old cups is installed. -BUILD_DEPENDS+= cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client -USES+= jpeg -COMMENT2= Library cupsimage -INSTALL_WRKSRC= ${WRKSRC}/filter -PLIST= ${MASTERDIR}/pkg-plist.image -USE_LDCONFIG= yes -PKGMESSAGE= ${NONEXISTENT} -DESCR= ${MASTERDIR}/pkg-descr.image -.else -LIB_DEPENDS+= libcups.so:${PORTSDIR}/${PKGCATEGORY}/cups-client \ - libcupsimage.so:${PORTSDIR}/${PKGCATEGORY}/cups-image -# force build if old cups is installed. -BUILD_DEPENDS+= cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client -BUILD_DEPENDS+= cups-image${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-image -COMMENT2= Server -USE_RC_SUBR= cupsd -PLIST_SUB+= CACHEDIR="${CUPS_CACHEDIR}" -BROKEN_ia64= stack-protector not supported on ia64 -.endif +AVAHI_LIB_DEPENDS= libavahi-client.so:${PORTSDIR}/net/avahi-app +AVAHI_CONFIGURE_ENABLE= avahi +AVAHI_SUB_LIST= AVAHI_DAEMON=avahi_daemon +AVAHI_SUB_LIST_OFF= AVAHI_DAEMON= + +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus +DBUS_CONFIGURE_ENABLE= dbus +DBUS_SUB_LIST= DBUS_DAEMON=dbus +DBUS_SUB_LIST_OFF= DBUS_DAEMON= + +IPPTOOL_DESC= Internet Printing Protocol testing tool + +LIBPAPER_LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper +LIBPAPER_CONFIGURE_ENABLE=libpaper + +X11_DESC= Install desktop menu item +X11_BUILD_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils +X11_RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils .if defined(CUPS_OVERWRITE_BASE) -PLIST_SUB+= OVERWRITE="" -CONFIGURE_ARGS+= --with-printcap=/etc/printcap +PLIST_SUB+= OVERWRITE="" .else -PLIST_SUB+= OVERWRITE="@comment " -CONFIGURE_ARGS+= --with-printcap=${PREFIX}/etc/printcap -.endif - -# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it -# will set the path of the interpreter to "no" and set it's existence to TRUE. -.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) -. if ${PORT_OPTIONS:MJAVA} -CONFIGURE_ARGS+= --with-java=${JAVA} -USE_JAVA= yes -. endif - -. if ${PORT_OPTIONS:MPERL} -CONFIGURE_ARGS+= --with-perl=${PERL} -USES+= perl5 -. endif - -. if ${PORT_OPTIONS:MPHP} -CONFIGURE_ARGS+= --with-php=${LOCALBASE}/bin/php-cgi -USE_PHP= yes -USE_PHP_BUILD= yes -WANT_PHP_CGI= yes -. endif - -. if ${PORT_OPTIONS:MPYTHON} -CONFIGURE_ARGS+= --with-python=${PYTHON_CMD} -USES+= python -. endif - -. if ${PORT_OPTIONS:MLIBPAPER} -CONFIGURE_ARGS+= --enable-libpaper -LIB_DEPENDS+= libpaper.so:${PORTSDIR}/print/libpaper -. endif - -. if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+= --enable-pam -. else -CONFIGURE_ARGS+= --disable-pam -. endif - -. if ${PORT_OPTIONS:MDBUS} -LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus -CONFIGURE_ARGS+= --enable-dbus -. else -CONFIGURE_ARGS+= --disable-dbus -. endif - -. if ${PORT_OPTIONS:MXDG_OPEN} -RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils -. endif - -. if ${PORT_OPTIONS:MLIBUSB} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603111153.u2BBrgon093783>