Remove desktop file and icons; we don't really need them (it's just a

launcher for http://localhost:631 and we may actually want to
configure a remote server); this is needed to prevent a dependency
loop: cups->gtk+2,-guic->cups.

This also allows us to drop 3 dependencies...
This commit is contained in:
ajacoutot 2011-12-04 15:40:57 +00:00
parent 16546dde76
commit ca450b9a0f
2 changed files with 13 additions and 29 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.120 2011/12/04 14:21:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.121 2011/12/04 15:40:57 ajacoutot Exp $
COMMENT= Common Unix Printing System
@ -6,7 +6,7 @@ VERSION= 1.5.0
DISTNAME= cups-${VERSION}-source
PKGNAME= cups-${VERSION}
REVISION= 6
REVISION= 7
CATEGORIES= print sysutils
@ -28,8 +28,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += asn1 c crypto dbus-1>=7 gssapi jpeg krb5 m png>=3 pthread
WANTLIB += ssl stdc++ tiff>=35 z usb
WANTLIB += asn1 c crypto dbus-1 gssapi jpeg krb5 m png pthread
WANTLIB += ssl stdc++ tiff usb z
MASTER_SITES= http://ftp.easysw.com/pub/cups/${VERSION}/ \
http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \
@ -46,10 +46,6 @@ BUILD_DEPENDS= devel/xdg-utils \
${MODGNU_AUTOMAKE_DEPENDS} \
${MODGNU_AUTOCONF_DEPENDS}
RUN_DEPENDS= devel/desktop-file-utils \
devel/xdg-utils
# x11/gtk+2,-guic
LIB_DEPENDS= graphics/png \
graphics/tiff \
devel/libusb-compat \
@ -143,7 +139,14 @@ post-install:
ln -sf ${LOCALBASE}/bin/smbspool \
${PREFIX}/libexec/cups/backend/smb
# Create a link to foomatic drivers database ; we do it here instead of
# Remove desktop file and icons; we don't really need them (it's just a
# launcher for http://localhost:631 and we may actually want to
# configure a remote server); this is needed to prevent a dependency
# loop: cups->gtk+2,-guic->cups
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...).

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.35 2011/12/03 23:04:36 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.36 2011/12/04 15:40:58 ajacoutot Exp $
@conflict LPRng-*
@newgroup _cups:541
@newuser _cups:541:541:daemon:CUPS printer spooler daemon:/var/empty:/sbin/nologin
@ -162,7 +162,6 @@ sbin/cupsreject
@bin sbin/lpinfo
@bin sbin/lpmove
sbin/reject
share/applications/cups.desktop
share/cups/
share/cups/banners/
share/cups/banners/classified
@ -1011,20 +1010,6 @@ share/examples/cups/ssl/
@sample ${SYSCONFDIR}/cups/ssl/
@mode
@group
share/icons/
share/icons/hicolor/
share/icons/hicolor/128x128/
share/icons/hicolor/128x128/apps/
share/icons/hicolor/128x128/apps/cups.png
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/cups.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/cups.png
share/icons/hicolor/64x64/
share/icons/hicolor/64x64/apps/
share/icons/hicolor/64x64/apps/cups.png
share/locale/da/cups_da.po
share/locale/de/cups_de.po
share/locale/es/cups_es.po
@ -1048,10 +1033,6 @@ share/locale/zh_TW/cups_zh_TW.po
@owner _cups
@group _cups
@sample /var/log/cups/
@exec %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q %D/share/icons/hicolor 2>/dev/null || true
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@extraunexec rm -rf /var/cache/cups
@extraunexec rm -rf /var/spool/cups
@owner