cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove bogus symlink which can make cups-driverd go into a loop.

Browse Source 
Add a note about updating to a new major version (may require to revove
the cache).
Check the configuration file sanity in rc_pre().

ok sthen@
This commit is contained in:
ajacoutot 2012-02-02 07:11:19 +00:00
parent 9852adda0e
commit 850003653b
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
print/cups/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.121 2011/12/04 15:40:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.122 2012/02/02 07:11:19 ajacoutot Exp $
COMMENT= Common Unix Printing System
@ -6,7 +6,7 @@ VERSION= 1.5.0
DISTNAME= cups-${VERSION}-source
PKGNAME= cups-${VERSION}
REVISION= 7
REVISION= 8
CATEGORIES= print sysutils
@ -146,11 +146,4 @@ post-install:
rm -rf ${PREFIX}/share/icons
rm -rf ${PREFIX}/share/applications
# Create a link to foomatic drivers database; we do it here instead of
# using --enable-ppds-to-cups in the foomatic-db port so that we don't
# need to depend on it (other printer driver packages install PPDs under
# ${PREFIX}/share/foomatic/db/source/PPD too, e.g. foo2zjs, hpijs...).
ln -sf ${LOCALBASE}/share/foomatic/db/source/PPD \
${PREFIX}/share/cups/model/foomatic-db-ppds
.include <bsd.port.mk>

3
print/cups/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.36 2011/12/04 15:40:58 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.37 2012/02/02 07:11:19 ajacoutot Exp $
@conflict LPRng-*
@newgroup _cups:541
@newuser _cups:541:541:daemon:CUPS printer spooler daemon:/var/empty:/sbin/nologin
@ -209,7 +209,6 @@ share/cups/mime/
share/cups/mime/mime.convs
share/cups/mime/mime.types
share/cups/model/
share/cups/model/foomatic-db-ppds
share/cups/ppdc/
share/cups/ppdc/epson.h
share/cups/ppdc/escp.h

10
print/cups/pkg/README
View File

@ -1,4 +1,4 @@
$OpenBSD: README,v 1.12 2011/10/02 14:41:48 ajacoutot Exp $
$OpenBSD: README,v 1.13 2012/02/02 07:11:19 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -50,3 +50,11 @@ chown _cups:_saned /dev/ugen0.* /dev/usb1
*** WARNING ***
ulpt(4) needs to be disable in the kernel (see config(8)) or the printer
will not be available to libusb.
UPGRADING
=========
If you experience cups-driverd(8) crashes or printing issues after
upgrading to a new major release (e.g. from 1.5 to 1.6), it may be
necessary to remove the old CUPS cache and restart cups(8):
# rm /var/cache/cups/* 2>/dev/null
# /etc/rc.d/cupsd restart

3
print/cups/pkg/cupsd.rc
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: cupsd.rc,v 1.9 2011/04/06 16:50:26 ajacoutot Exp $
# $OpenBSD: cupsd.rc,v 1.10 2012/02/02 07:11:19 ajacoutot Exp $
daemon="${TRUEPREFIX}/sbin/cupsd"
@ -14,6 +14,7 @@ _lpfiles="/usr/bin/lpq /usr/bin/lpr /usr/bin/lprm /usr/sbin/lpc \
/usr/share/man/cat8/lpd.0"
rc_pre() {
${daemon} -t || return 1
[ -e /dev/ulpt0 ] && chown _cups /dev/ulpt[0-1]
[ -e /dev/lpt0 ] && chown _cups /dev/lp[a,t][0-2]