svn commit: r352145 - head/print/cups-base

[Boris Samorodov]

Author: bsam
Date: Fri Apr 25 19:31:13 2014
New Revision: 352145
URL: http://svnweb.freebsd.org/changeset/ports/352145
QAT: https://qat.redports.org/buildarchive/r352145/

Log:
  print/cups-base: add an options ICONS to install desktop icons
  
  When unchecked this option greatly reduces the package depends list  [1]
  (from 82 to 42).
  
  Defaults to "on" for ordinary package users sake.
  
  Submitted by:	Hilko Meyer <Hilko.Meyer at gmx.de>  [1]

Modified:
  head/print/cups-base/Makefile
  head/print/cups-base/pkg-plist

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Fri Apr 25 19:06:55 2014	(r352144)
+++ head/print/cups-base/Makefile	Fri Apr 25 19:31:13 2014	(r352145)
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=	--localstatedir=/var			
 			--with-cups-group=${GROUPS}		\
 			--with-system-groups=${CUPSSYSGRP}	\
 			--with-docdir=${DOCSDIR}		\
-			--with-icondir=${PREFIX}/share/icons	\
 			--with-menudir=${DESKTOPDIR}		\
 			--with-domainsocket=${CUPS_SOCKET}	\
 			--with-cachedir=${CUPS_CACHEDIR}	\
@@ -63,14 +62,14 @@ CUPS_SUFFIX=	-image
 LICENSE=	LGPL21
 OPTIONS_DEFINE=	GNUTLS
 .else
-INSTALLS_ICONS=	yes
 PORTREVISION=	0
 CUPS_SUFFIX=	-base
-OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM DBUS LIBUSB XDG_OPEN AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT=	LIBPAPER MDNSRESPONDER
+OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM DBUS LIBUSB XDG_OPEN AVAHI MDNSRESPONDER ICONS
+OPTIONS_DEFAULT=	LIBPAPER MDNSRESPONDER ICONS
 NO_OPTIONS_SORT=	yes
 .endif
 
+ICONS_DESC=		Desktop icons
 LIBUSB_DESC=		USB support
 XDG_OPEN_DESC=		Build with XDG_OPEN as browser
 
@@ -197,6 +196,15 @@ CONFIGURE_ARGS+=	--enable-libusb
 .else
 CONFIGURE_ARGS+=	--disable-libusb
 .endif
+
+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MICONS}
+INSTALLS_ICONS=	yes
+CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
+PLIST_SUB+=		WITH_ICONS=""
+.else
+PLIST_SUB+=		WITH_ICONS="@comment "
+.endif
+
 CONFIGURE_ARGS+=	LIBS="-lssp_nonshared"
 
 .if ! defined(CUPS_CLIENT) && ! defined(CUPS_IMAGE)

Modified: head/print/cups-base/pkg-plist
==============================================================================
--- head/print/cups-base/pkg-plist	Fri Apr 25 19:06:55 2014	(r352144)
+++ head/print/cups-base/pkg-plist	Fri Apr 25 19:31:13 2014	(r352145)
@@ -957,10 +957,10 @@ sbin/ulpt-cupsd.sh
 %%PORTDOCS%%%%DOCSDIR%%/ru/index.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf
 share/applications/cups.desktop
-share/icons/hicolor/128x128/apps/cups.png
-share/icons/hicolor/16x16/apps/cups.png
-share/icons/hicolor/32x32/apps/cups.png
-share/icons/hicolor/64x64/apps/cups.png
+%%WITH_ICONS%%share/icons/hicolor/128x128/apps/cups.png
+%%WITH_ICONS%%share/icons/hicolor/16x16/apps/cups.png
+%%WITH_ICONS%%share/icons/hicolor/32x32/apps/cups.png
+%%WITH_ICONS%%share/icons/hicolor/64x64/apps/cups.png
 share/locale/ca/cups_ca.po
 share/locale/cs/cups_cs.po
 share/locale/de/cups_de.po
@@ -976,16 +976,16 @@ share/locale/ru/cups_ru.po
 @unexec rmdir "/var/log/cups" >/dev/null 2>&1 || :
 @unexec rmdir "/var/db/cups/rss" >/dev/null 2>&1 || :
 @unexec rmdir "/var/db/cups" >/dev/null 2>&1 || :
- at dirrmtry share/icons/hicolor/16x16/apps
- at dirrmtry share/icons/hicolor/16x16
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/64x64/apps
- at dirrmtry share/icons/hicolor/64x64
- at dirrmtry share/icons/hicolor/128x128/apps
- at dirrmtry share/icons/hicolor/128x128
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/16x16/apps
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/16x16
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/32x32/apps
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/32x32
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/64x64/apps
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/64x64
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/128x128/apps
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor/128x128
+%%WITH_ICONS%%@dirrmtry share/icons/hicolor
+%%WITH_ICONS%%@dirrmtry share/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/cs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ca
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/de