Create both the _cups user and group in -libs instead of splitting them.
Regen WANTLIB while here.
This commit is contained in:
parent
eef0f75028
commit
279d534633
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.139 2012/08/23 16:25:48 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.140 2012/09/08 07:54:03 ajacoutot Exp $
|
||||
|
||||
COMMENT-main= Common Unix Printing System
|
||||
COMMENT-libs= CUPS libraries and headers
|
||||
@ -7,8 +7,8 @@ VERSION= 1.6.1
|
||||
DISTNAME= cups-${VERSION}-source
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
REVISION-main= 2
|
||||
REVISION-libs= 2
|
||||
REVISION-main= 3
|
||||
REVISION-libs= 3
|
||||
|
||||
PKGNAME-main= cups-${VERSION}
|
||||
PKGNAME-libs= cups-libs-${VERSION}
|
||||
@ -31,11 +31,11 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB += asn1 c crypto gssapi krb5 m pthread
|
||||
WANTLIB += asn1 crypto gssapi krb5 m pthread
|
||||
WANTLIB += ssl stdc++ z
|
||||
|
||||
WANTLIB-main += ${WANTLIB}
|
||||
WANTLIB-main += cups cupscgi cupsimage cupsmime cupsppdc dbus-1 usb-1.0
|
||||
WANTLIB-main += c cups cupscgi cupsimage cupsmime cupsppdc dbus-1 usb-1.0
|
||||
|
||||
MASTER_SITES= http://ftp.easysw.com/pub/cups/${VERSION}/ \
|
||||
http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \
|
||||
|
@ -1,6 +1,7 @@
|
||||
@comment $OpenBSD: PLIST-libs,v 1.1 2012/08/04 14:37:04 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-libs,v 1.2 2012/09/08 07:54:03 ajacoutot Exp $
|
||||
@conflict cups-<1.6.0
|
||||
@newgroup _cups:541
|
||||
@newuser _cups:541:541:daemon:CUPS printer spooler daemon:/nonexistent:/sbin/nologin
|
||||
%%SHARED%%
|
||||
bin/cups-config
|
||||
include/cups/
|
||||
|
@ -1,8 +1,7 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2012/08/23 16:25:48 ajacoutot Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2012/09/08 07:54:03 ajacoutot Exp $
|
||||
@conflict LPRng-*
|
||||
@pkgpath print/cups
|
||||
@pkgpath print/cups,ldap
|
||||
@newuser _cups:541:541:daemon:CUPS printer spooler daemon:/nonexistent:/sbin/nologin
|
||||
@extraunexec rm -rf ${SYSCONFDIR}/cups/*.conf.O /var/log/cups/*
|
||||
@bin bin/cancel
|
||||
@bin bin/cupstestdsc
|
||||
|
Loading…
Reference in New Issue
Block a user