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

print/cups-base: bump port revision

PR:		190434
Pointy hat to:	pi

print/cups-base: revert change for ICONS option

- This does not really solve the problem

PR:		190434
Pointy hat to:	pi

print/cups-base: rename ICONS option to X11

Why this change ?
- When compiling print/cups-base, if WITHOUT_X11=yes is present in
  /etc/make.conf, CUPS still tries to update the "Icons cache".
- For this, it tries to build graphics/gtk-update-icon-cache,
  which in turns requires graphics/cairo, but Cairo builds without
  X11 support as requested, and graphics/gtk-update-icon-cache
  fails to build because it needs X11.

PR:		190434
Submitted by:	Tobias Kortkamp <t@tobik.me>
Reported by:	hjf@hjf.com.ar

Remove UNIQUENAME and LATEST_LINK.

UNIQUENAME was never unique, it was only used by USE_LDCONFIG and now,
we won't have conflicts there.

Use PKGBASE instead of LATEST_LINK in PKGLATESTFILE, the *only* consumer
is pkg-devel, and it works just fine without LATEST_LINK as pkg-devel
has the correct PKGNAME anyway.

Now that UNIQUENAME is gone, OPTIONSFILE is too. (it's been called
OPTIONS_FILE now.)

Reviewed by:	antoine, bapt
Exp-run by:	antoine
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D3336

Convert to USES=jpeg

Attempt to fix runtime on FreeBSD 10

Reported by:	pkg-fallout

Add missing iconv library.

PR:	200755

Add a missing file to plist when Avahi is selected.

CUPS 2.x does not support OpenSSL any more.  Switch to GNU TLS by default.

MFH:		2015Q2

Security update to 2.0.3.

- Add CPE info

Approved by:	portmgr blanket

3 ports categories: Remove $PTHREAD_LIBS

Categories: print, science, emulators

approved by:	PTHREAD blanket

print/cups-client via print/cups-base: treat avahi/dnssd explicitely

1. The port's configure script is auto-detecting if avahi exists
(unless avahi is explicitely disabled):
---
   9096 if test "x$PKGCONFIG" != x -a x$enable_avahi != xno; then
   9097         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Avahi" >&5
   9098 $as_echo_n "checking for Avahi... " >&6; }
   9099         if $PKGCONFIG --exists avahi-client; then
   9100                 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes"
>&5
   9101 $as_echo "yes" >&6; }
---

So if avahi-lib is installed one get config.log:
---

security/libgcrypt: 1.6.1 -> 1.6.2, bump depends

Changes:
- src/sexp.c (do_vsexp_sscan): Return error for invalid args.
- cipher/md.c (_gcry_md_info): Fix a segv in case of calling
  with wrong parameters.
- cipher/primegen.c (_gcry_generate_elg_prime): Change to return an
  error code, possible NULL deref in call to prime generator.
- cipher/dsa.c (generate): Take care of new return code.
- cipher/elgamal.c (generate): Change to return an error code.  Take
	care of _gcry_generate_elg_prime return code.
- ecc: Support the non-standard 0x40 compression flag for EdDSA.
- mpi: Extend the internal mpi_get_buffer.
- mpi: Fix regression for powerpc-apple-darwin detection.
- Fix bug inhibiting the use of the sentinel attribute in src/gcrypt.h.in

Bump portrevision after png update

Change libpng15.so to libpng.so in LIB_DEPENDS to prepare the upgrade

print/cups-base: Fix build when PAM option is enabled

The @sample keyword fixes the config file based error.  While here,
clean refactor the port a bit.

PR:		194854
Submitted by:	Adrian Waters
Final fix by:	Takefu (airport.fm)

Properly strip libraries in cups-base, cups-client and cups-image ports

Cleanup plist

- Let the rc script require the mdnsd or avahi_daemon rc scripts [1]
- Fix two getsockopt calls so they return peer credentials correctly [2]

PR:		194856 [1], 191515 [2]
Submitted by:	Adrian Waters <draenan@gmail.com> [1]
Submitted by:	Bengt Ahlgren <bengta@sics.se> [2]

- Convert ports of news/ and print/ to new USES=python

Approved by: portmgr (implicit)

DOCS isn't optional.  The files provide the cups web interface.

security/libgcrypt: 1.5.3_3 -> 1.6.1

- Update to 1.6.1
- Remove some unneeded patches
- Fix pkg-plist
- report configure bug upstream
  https://bugs.g10code.com/gnupg/issue1668
- report API breakage downstream and find that MacPorts had the same issue
  https://rt.cpan.org/Ticket/Display.html?id=97201
- bump PORTREVISION for dependent ports (approx. 100 ports)
- Thanks to exp-run by antoine@ to find ports that break
- patch ports that would otherwise break
  security/shishi with PR 192164 is already committed
  [1] devel/ccrtp
  [2] editors/abiword
  [3] security/p5-Crypt-GCrypt

PR:		191256, 192162 [1], 192163 [2], 192166 [3]
Submitted by:	Carlos Jacobo Puga Medina <cjpugmed@gmail.com>
Approved by:	maintainer timeout, antoine (exp-run), portmgr (implicit)

print/cups-base: Don't use avahi when MDNSRESPONDER option is selected

PR:		191619
Submitted by:	Don Lewis
Approval:	Not required; port is unmaintained

- Replace security/gnutls with security/gnutls3 and update to 3.2.15
- Bump PORTREVISION on all ports that depend on security/gnutls and
  adjust all ports that depend on security/gnutls3
- Update mail/anubis to version 4.2 which supports gnutls 3.x
- Update mail/libvmime to a development snapshot (recommended by upstream
  developers)

PR:		191274
Exp-run by:	antoine
Approved by:	portmgr (antoine)

- Update to 1.7.3
- Add DOCS option
- PHP option no longer installs a PHP module (it was eliminated in 1.6)
- Add options for other interpreters
- Add OPENSSL option to make it clearer that it is enabled instead of GNUTLS
- Fix build when ZEROCONF is disabled
- Fix detection of libusb on FreeBSD < 10 as they do not have .pc files for it
- Use @sample directive in pkg-plist
- Remove some old cruft

- Switch print/libpaper to USES=libtool, drop .la files
- Bump dependent ports as .so version has changed

Approved by:	portmgr blanket

Support LIBS like LDFLAGS.

- Add LIBS="${LIBS}" to MAKE_ENV and CONFIGURE_ENV.
- Add an option helper for LIBS.
- Adjust all ports that already use LIBS.  Also remove references to
  PTHREAD_CFLAGS and PTHREAD_LIBS while here.
- Some ports did not support having a LIBS environment variable and
  required additional patches.

Somewhat simplified a linker command line looks like:

${CC} ${src_LDFLAGS} ${LDFLAGS} ${src_LIBS} ${LIBS}

where src_LDFLAGS and src_LIBS are controlled by upstream and LDFLAGS and
LIBS can be controlled by us.  If possible -L and -l flags need to be

print/cups-base: remove files/cups_browsed.in, it does not belong here

. remove using cups_browsed.in;  [1]
. bump PORTREVISION.

PR:		ports/190085  [1]
Submitted by:	Fafael Ostertag <rafi@guengel.ch>  [1]

print/cups-base: unbreak AVAHI option and add missing rc script

- Add missing rc script for cups-browsed [1]
- Enable building CUPS with native Avahi backend [2]
- Disable AVAHI if not selected [3]

PR:             ports/188550 [1],
                ports/189757 [2],
                ports/188751 [3]
Submitted by:   Rafael Ostertag <rafi@guengel.ch> [1],
                Raivo Hool <raivo.hool@gmail.com> [2],
                Dan Lukes <dan@obluda.cz> [3]
Approved by:    culot (mentor)

print/cups-base: add an options ICONS to install desktop icons

When unchecked this option greatly reduces the package depends list  [1]
(from 82 to 42).

Defaults to "on" for ordinary package users sake.

Submitted by:	Hilko Meyer <Hilko.Meyer@gmx.de>  [1]

print/cups{,-base,-client,-image}: update to version 1.7.2

MDNSRESPONDER id now the default option for print/cups-base
(can't be compiled without dnssd).

print/cups-base: remove BLOCKS detection from cups/cups.h

It appears to be the best option here, i.e. just remove BLOCKS
detection from cups/cups.h: there are some other ports which
use cups/cups.h and get broken by a BLOCKS detection. So:
. patch cups/cups.h to remove the offending code;
. remove traces of previous attempts to fix cups-* ports;
. bump PORTREVISION;
. at PORTNAME block add a note that PORTREVISION is defined
  later for all ports.

Discussed at:	freebsd-ports
Suggested by:	tijl
MFH:		2014Q2

- Fix plist to have proper 'rmdir DIR' ordering.
  Pkgng will not detect the directory otherwise. This was due to
  incorrectly advise in the check-stagedir.sh script, fixed in
  r351587

With hat:	portmgr

A try (since I can't reproduce it at CURRENT) to fix "make index":
include USES+=compiler unconditionally.

Reported by:	Poersnap buildbox

. fix cross-building;  [1];
. refine comment.

Reported by:	gjb [1]
Suggested by:	bdrewery [1]
MFH:		2014Q2

Remove an unused configure flag.
configure: WARNING: unrecognized options: --disable-slp

Sponsored by:	The FreeBSD Foundation

print/cups-base: add CFLAGS+=-fno-blocks to print/cups-image at gcc systems

In additiond to print/cups-client (r350154):
Use CFLAGS+=-fno-blocks to unbreak systems with default gcc compiler.
This is a band-aid that should be reworked for systems with blocks
and libdispatch support.

Reported by:	Anton Shterenlikht <mexas@bris.ac.uk>
Tested by:	Anton Shterenlikht <mexas@bris.ac.uk>
Discussed at:	freebsd-ports@
MVH:		2014Q2

Use CFLAGS+=-fno-blocks to unbreak systems with default gcc compiler.
This is a band-aid that should be reworked for systems with blocks
and libdispatch support.

Reported by:	Anton Shterenlikht <mexas@bris.ac.uk>
Discussed at:	freebsd-ports@
MFH:		2014Q2

Update to cups to 1.7.1
- Stage all cups related ports
- Cleanup (it still needs more cleanup)

Base on [1]

PR:		ports/186824 [1]
Submitted by:	bsam

Fix installation of cups-base when libiconv is installed: do not descend
into the cups subdirectory.  That directory is already installed by the
cups-client port and it requires USES=iconv.

Reported by:	Mark Knight <markk@knigma.org>

Release cups-* nad foomatic-* ports. Currently I have no enough
spare time for those ports.

I've submitted ports/186824 to update cups-* ports to version 1.7.0.

- Stage support part1 for client and image

Submitted by:	antoine

Update master sites for some ports formerly hosted on easysw.com, now extinct.

Remove easysw.com domain from MASTER_SITE_EASYSW, and drop tu-bs.de from mirror
list (is no longer mirroring easysw.com).

Guess I should take those ports...

- Use USES=gmake

- Return ports to the pool

PR:	ports/183244
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> (former maintainer)

- Remove manual creation and removal of share/applications, as it's now in the
mtree (categories starting with [np])

Approved by:	portmgr (bdrewery)

- Add explicit LDFLAGS for iconv

Submitted by:	marino
Approved by:	portmgr (bapt)

Add NO_STAGE all over the place in preparation for the staging support (cat:
print)

Only cups-base INSTALLS_ICONS

Submitted by:	Scott Allendorf <scott-allendorf@uiowa.edu>

Fix reinstall

Correct IGNORE messages

INSTALLS_ICONS

PR:		ports/174815
Submitted by:	nemysis <nemysis@gmx.ch>
Approved by:	Chris Petrik <c.petrik.sosa@gmail.com> (maintainer)

- Fix plist

Reported by:	pkg (DEVELOPER_MODE)

- Fix typo w.r.t. XDG_OPEN option
- Add a a backported patch from cups 1.6 which fixes an issue with regard to a
timed out TCP connection. it should be
deleted once the port is updated to 1.6.
- Pet portlint a bit
- remove unused CONFLICTS line

PR:		178987
Submitted by:	"r4721@tormail.org" <r4721@tormail.org>
PR:		179194
Submitted by:	Sayetsky Anton <vsjcfm@gmail.com>
Approved by:	c.petrik.sosa@gmail.com (maintainer)

Chase security/libgcrypt update

In preparation of removing devel/libusb (expires 2013-04-30), remove it
from these ports.

Other changes:
- convert Makefile header
- convert to optionsNG
- remove indefinite article from comment
- drop support for FreeBSD < 8.0
- pet portlint (leave library ABI versions in LIB_DEPENDS)
- net-mgmt/spectools: change option name from GTK to GTK2 to use default
  description from bsd.options.desc.mk

Approved by:	portmgr (bapt)

- Convert USE_ICONV=yes to USES=iconv
- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig and
  USE_GETTEXT=yes to USES=gettext while here

Finish converting the whole ports tree to USES=pkgconfig

- Please welcome back Chris Petrik as maintainer of
  these ports [1]
- Trim headers
- Remove indefinite article from COMMENT
- Convert tab to space in WWW lines

PR:		ports/175415 [1]
Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com> [1]
Discussed with:	bapt

- Add UPDATING entry for gnutls update
- Chase shlib version bump for dependant ports

Fix file installation when MDNSRESPONDER=on

PR:		ports/174352 (based on)
Submitted by:	Geraud CONTINSOUZAS <geraud@gcu.info>

- update to 1.5.4

- drop maintainership
Feature safe: yes

- fix option XPDF
PR:		172579
Submitted by:	Kris Moore
Feature safe: yes

- cleanup comments

- use WITH_OPENSSL_HACK7

- fix option PYTHON
PR:		170801
Submitted by:	Artis Caune

new devel/pkgconf added to replace devel/pkg-config. new version of pkg-config
are no more self hosting so we are stuck with 0.25 version while pkgconf provide
the same set of features as 0.27 and a compatible frontend. A symlink to
pkg-config has been added for convenience and compatibility

This also introduces a new macro to use pkgconf in your ports:
USE_PKGCONFIG

it can take the following arguments:
 - yes (meaning build only dep)
 - build (meaning build only dep)
 - run (meaning run only dep)
 - both (meaning run and build dep)

From now USE_GNOME= pkgconfig is deprecated in favour of USE_PKGCONFIG
The old gnome macro has been modified to use pkgconf but still the sameway: run
and build dep to avoid large breakage.

While here fix some ports relying on pkg-config but not specifying it, fix some
ports broken because testing wrong .pc files, and fix ports using pkg-config
--version to determine pkg-config version instead of
pkg-config --modversion pkg-config like recommanded by pkg-config

With Hat:	portmgr
Exp-runs by:	bapt (pointhat-west), beat (pointyhat)

- fix option XPDF
PR:             169648
Submitted by:   John Levine

- shorter desc for options

- fix option GHOSTSCRIPT
- use LIBPAPER as default

- use OPTIONS_DEFINE

- do not drop spool on update

- update png to 1.5.10

- rename broken option DNSSD to AVAHI
- new option MDNSRESPONDER
PR:             165206
Suggested by:   Matthieu Volat
Feature safe:   yes

- fix build for FreeBSD 7.x

- add USE_ICONV to cups-client

- update to 1.5.2
PR:             164293
Submitted by:   Eygene Ryabinkin

- escape shell names

In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

- add some hooks

- force build with same cups client installed

- update to 1.5.0
- unbreak option WITH_GNUTLS

- Add LDFLAGS to CONFIGURE_ENV and MAKE_ENV (as it was done with LDFLAGS)
- Fix all ports that add {CPP,LD}FLAGS to *_ENV to modify flags instead

PR:             157936
Submitted by:   myself
Exp-runs by:    pav
Approved by:    pav

- better wording of BROKEN
Submitted by:   crees

- fix plist
Submitted by:   ale

- add BROKEN fro option GNUTLS

- better wording of GNUTLS option
Submitted by:   mandree

- update to 1.4.8
- option GNUTLS default off
Security: http://www.cups.org/str.php?L3914

Chase security/gnutls update and add an UPDATING entry.

- bump PORTREVISION
Reported by:    Sunpoet Po-Chuan Hsieh

PR:             156866
Submitted by:   Alex Deiter

- Bump PORTREVISION to advertise recent plist fix

Reported by:    pointyhat

- fix option WITH_PAM
Reported by:    ale

- fix build with lang/gcc45
PR:             155334
Submitted by:   Ron MacNeil

- preserve modified etc/pam.d/cups
PR:             155218
Sumbitted by:   mm

- add lpr-cups
Suggested by:   avilla

- add missing patch

- fix unexistent PAM module
PR:     154361
Submitted by:   Daisuke Ban
Feature safe:   yes

Fix typo in sample devd config.

Approved by:    dinoex (maintainer)
Feature safe:   yes