diff options
| -rw-r--r-- | sysutils/gnome-settings-daemon3/Makefile | 14 | ||||
| -rw-r--r-- | sysutils/gnome-settings-daemon3/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/gnome-settings-daemon3/files/patch-configure | 13 | ||||
| -rw-r--r-- | sysutils/gnome-settings-daemon3/pkg-plist | 4 |
4 files changed, 30 insertions, 5 deletions
diff --git a/sysutils/gnome-settings-daemon3/Makefile b/sysutils/gnome-settings-daemon3/Makefile index ccbe07b0b..600fcddb0 100644 --- a/sysutils/gnome-settings-daemon3/Makefile +++ b/sysutils/gnome-settings-daemon3/Makefile @@ -3,12 +3,11 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.12 2011/03/08 22:40:54 kwm Exp $ +# $MCom: ports/sysutils/gnome-settings-daemon3/Makefile,v 1.13 2011/03/08 22:44:04 kwm Exp $ # PORTNAME= gnome-settings-daemon -PORTVERSION= 2.91.90 -PORTREVISION= 2 +PORTVERSION= 2.91.91 CATEGORIES= sysutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome3 @@ -36,6 +35,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" OPTIONS= PULSEAUDIO "Enable Pulseaudio support" On \ + CUPS "Enable cups (printing) support" On \ SMARTCARD "Enable smartcard support" On GLIB_SCHEMAS= org.gnome.settings-daemon.enums.xml \ @@ -63,6 +63,14 @@ CONFIGURE_ARGS+=--enable-pulse PLIST_SUB+= PULSEAUDIO="" .endif +.if defined(WITH_CUPS) +LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +PLIST_SUB+= CUPS="" +.else +PLIST_SUB+= CUPS="@comment " +CONFIGURE_ARGS+=--disable-cups +.endif + .if defined(WITHOUT_SMARTCARD) CONFIGURE_ARGS+=--disable-smartcard-support PLIST_SUB+= SMARTCARD="@comment " diff --git a/sysutils/gnome-settings-daemon3/distinfo b/sysutils/gnome-settings-daemon3/distinfo index e7eb32076..c8feee319 100644 --- a/sysutils/gnome-settings-daemon3/distinfo +++ b/sysutils/gnome-settings-daemon3/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/gnome-settings-daemon-2.91.90.tar.bz2) = 333790ebd671e1046510dd128ac997571af56767ea72919d7966690c7ec9cb54 -SIZE (gnome3/gnome-settings-daemon-2.91.90.tar.bz2) = 1403559 +SHA256 (gnome3/gnome-settings-daemon-2.91.91.tar.bz2) = ae649cc1c723ebae99491ca2bf68d8e6c08ac0b3a6c81e94aedbb5b7a8f91c86 +SIZE (gnome3/gnome-settings-daemon-2.91.91.tar.bz2) = 1459661 diff --git a/sysutils/gnome-settings-daemon3/files/patch-configure b/sysutils/gnome-settings-daemon3/files/patch-configure new file mode 100644 index 000000000..1926ec3fe --- /dev/null +++ b/sysutils/gnome-settings-daemon3/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2011-03-09 15:18:53.000000000 +0100 ++++ configure 2011-03-09 15:19:16.000000000 +0100 +@@ -19721,8 +19721,8 @@ + + + CUPS_API_VERSION=`$CUPS_CONFIG --api-version` +- CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\n/g" | sed -n "1p"` +- CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\n/g" | sed -n "2p"` ++ CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\ /g" | awk '{ print $1 }'` ++ CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | sed -e "s/\./\ /g" | awk '{ print $2 }'` + + for ac_header in cups/cups.h cups/http.h cups/ipp.h + do : diff --git a/sysutils/gnome-settings-daemon3/pkg-plist b/sysutils/gnome-settings-daemon3/pkg-plist index 38e7d1fbc..e1f443267 100644 --- a/sysutils/gnome-settings-daemon3/pkg-plist +++ b/sysutils/gnome-settings-daemon3/pkg-plist @@ -36,6 +36,9 @@ lib/gnome-settings-daemon-3.0/libkeyboard.so lib/gnome-settings-daemon-3.0/libmouse.a lib/gnome-settings-daemon-3.0/libmouse.la lib/gnome-settings-daemon-3.0/libmouse.so +%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.a +%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.la +%%CUPS%%lib/gnome-settings-daemon-3.0/libprint-notifications.so %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.a %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.la %%SMARTCARD%%lib/gnome-settings-daemon-3.0/libsmartcard.so @@ -53,6 +56,7 @@ lib/gnome-settings-daemon-3.0/libxsettings.la lib/gnome-settings-daemon-3.0/libxsettings.so %%PULSEAUDIO%%lib/gnome-settings-daemon-3.0/media-keys.gnome-settings-plugin lib/gnome-settings-daemon-3.0/mouse.gnome-settings-plugin +%%CUPS%%lib/gnome-settings-daemon-3.0/print-notifications.gnome-settings-plugin %%SMARTCARD%%lib/gnome-settings-daemon-3.0/smartcard.gnome-settings-plugin lib/gnome-settings-daemon-3.0/sound.gnome-settings-plugin lib/gnome-settings-daemon-3.0/wacom.gnome-settings-plugin |