diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2010-11-15 09:06:06 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2010-11-15 09:06:06 +0000 |
| commit | dcd7353e7d53f5551daea86f1ed65c2994e5f3b8 (patch) | |
| tree | 70b516f5f6640c27a2cc3886c4d079d615c96780 /print | |
| parent | 03b04c6c13c848b0811d5111f9aa118410270273 (diff) | |
| download | ports-dcd7353e7d53f5551daea86f1ed65c2994e5f3b8.tar.gz ports-dcd7353e7d53f5551daea86f1ed65c2994e5f3b8.zip | |
Notes
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups-base/Makefile | 4 | ||||
| -rw-r--r-- | print/cups-base/pkg-descr | 2 | ||||
| -rw-r--r-- | print/cups-base/pkg-descr.client | 2 | ||||
| -rw-r--r-- | print/cups-base/pkg-descr.image | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index 3bbe2c731dc0..60a05e2148b8 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -68,11 +68,14 @@ CUPSSYSGRP= wheel # UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included .if defined(CUPS_CLIENT) +LICENSE= LGPL21 CUPS_SUFFIX= -client .elif defined(CUPS_IMAGE) CUPS_SUFFIX= -image +LICENSE= LGPL21 .else CUPS_SUFFIX= -base +CONFLICTS+= cupsddk-* .endif .include <bsd.port.pre.mk> @@ -97,7 +100,6 @@ USE_LDCONFIG= yes PKGMESSAGE= ${NONEXISTENT} DESCR= ${MASTERDIR}/pkg-descr.image .else -CONFLICTS+= cupsddk-* LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \ cupsimage.2:${PORTSDIR}/${PKGCATEGORY}/cups-image # force build if old cups is installed. diff --git a/print/cups-base/pkg-descr b/print/cups-base/pkg-descr index 0eddd683c2fd..cb23c61b7806 100644 --- a/print/cups-base/pkg-descr +++ b/print/cups-base/pkg-descr @@ -17,7 +17,7 @@ non-PostScript printers. Sample drivers for HP and EPSON printers are included that use these filters. This software is available in the cups-pstoraster port. -LICENSE: GPL2 only with exception to link with OpenSSL +LICENSE: GPL2 or later with exception to link with OpenSSL WWW: http://www.cups.org/ [original text by greid@ukug.uk.freebsd.org] diff --git a/print/cups-base/pkg-descr.client b/print/cups-base/pkg-descr.client index 8639c4fb5c1b..c4d4ed52ac39 100644 --- a/print/cups-base/pkg-descr.client +++ b/print/cups-base/pkg-descr.client @@ -1,5 +1,5 @@ This provides libcups for applications to access CUPS. -LICENSE: LGPL2 only with exception to link with OpenSSL +LICENSE: LGPL2 or later with exception to link with OpenSSL WWW: http://www.cups.org/ diff --git a/print/cups-base/pkg-descr.image b/print/cups-base/pkg-descr.image index ee790508f069..77526b2611a9 100644 --- a/print/cups-base/pkg-descr.image +++ b/print/cups-base/pkg-descr.image @@ -1,5 +1,5 @@ This provides libcupsimage for applications to process CUPS raster files. -LICENSE: LGPL2 only with exception to link with OpenSSL +LICENSE: LGPL2 or later with exception to link with OpenSSL WWW: http://www.cups.org/ |