diff options
author | Tijl Coosemans <tijl@FreeBSD.org> | 2016-03-11 11:53:42 +0000 |
---|---|---|
committer | Tijl Coosemans <tijl@FreeBSD.org> | 2016-03-11 11:53:42 +0000 |
commit | 59272d10178066cdfa1d1aea23c915a09473d798 (patch) | |
tree | 923210657ff3819220d9f901a4ae5748d77b8564 /java | |
parent | sysutils/freefilesync: fixup runtime for DragonFly (diff) |
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)
Notes
Notes:
svn path=/head/; revision=410825
Diffstat (limited to 'java')
-rw-r--r-- | java/openjdk6/Makefile | 2 | ||||
-rw-r--r-- | java/openjdk7/Makefile | 2 | ||||
-rw-r--r-- | java/openjdk8/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 6b11b63145a5..0e1ba2040be8 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -22,7 +22,7 @@ LICENSE_DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 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 diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 6c97592420c8..529bd368357d 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -74,7 +74,7 @@ LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib \ 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 diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index cf4c4e5f4402..813c0842e7bf 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -29,7 +29,7 @@ COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} 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 \ |