From 34d827c1729a9251171b94d400d8ea750bc1cdb7 Mon Sep 17 00:00:00 2001 From: gusi Date: Thu, 31 Jul 2014 10:24:00 +0000 Subject: Update cinnamon to 2.2.14 and related ports to the last version available. While here: - switch maintainership to gnome@FreeBSD.org - convert those ports with options to the compact form - stop using paths in {run/lib}_depends and instead use the package:dir form - ensure no USE_AUTOTOOLS= libtool is used. Those doing the autofoo dance must use libtoolize instead I will drop keepla in the future. I did no want to mix that with this commit. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19786 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/cinnamon-settings-daemon/Makefile | 30 ++++++++---------------------- sysutils/cinnamon-settings-daemon/distinfo | 4 ++-- 2 files changed, 10 insertions(+), 24 deletions(-) (limited to 'sysutils/cinnamon-settings-daemon') diff --git a/sysutils/cinnamon-settings-daemon/Makefile b/sysutils/cinnamon-settings-daemon/Makefile index 0572c5048..eecc9ab76 100644 --- a/sysutils/cinnamon-settings-daemon/Makefile +++ b/sysutils/cinnamon-settings-daemon/Makefile @@ -3,7 +3,7 @@ # $MCom$ PORTNAME= cinnamon-settings-daemon -PORTVERSION= 2.2.3 +PORTVERSION= 2.2.4 CATEGORIES= sysutils gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 @@ -13,7 +13,7 @@ COMMENT= GNOME 3 settings daemon BUILD_DEPENDS= cinnamon-session:${PORTSDIR}/x11/cinnamon-session \ gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \ - ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas \ + gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \ docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libpolkit-gobject-1.so:${PORTSDIR}/sysutils/polkit \ @@ -26,7 +26,7 @@ LIB_DEPENDS= libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3 \ libgdbm.so:${PORTSDIR}/databases/gdbm \ libnotify.so:${PORTSDIR}/devel/libnotify RUN_DEPENDS= cinnamon-session:${PORTSDIR}/x11/cinnamon-session \ - ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas + gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= gnomehier gnomeprefix intlhack libgnomekbd \ @@ -58,28 +58,14 @@ GLIB_SCHEMAS= org.cinnamon.settings-daemon.enums.xml \ org.cinnamon.settings-daemon.plugins.xrandr.gschema.xml \ org.cinnamon.settings-daemon.plugins.xsettings.gschema.xml \ +OPTIONS_SUB= yes OPTIONS_DEFINE= CUPS SMARTCARD OPTIONS_DEFAULT=CUPS SMARTCARD SMARTCARD_DESC= Smartcard support - -.include - -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -PLIST_SUB+= CUPS="" -.else -PLIST_SUB+= CUPS="@comment " -CONFIGURE_ARGS+=--disable-cups -.endif - -.if ${PORT_OPTIONS:MSMARTCARD} -LIB_DEPENDS+= libnss3.so:${PORTSDIR}/security/nss -CONFIGURE_ARGS+=--enable-smartcard-support -PLIST_SUB+= SMARTCARD="" -.else -CONFIGURE_ARGS+=--disable-smartcard-support -PLIST_SUB+= SMARTCARD="@comment " -.endif +CUPS_CONFIGURE_ENABLE= cups +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client +SMARTCARD_CONFIGURE_ENABLE= smartcard-support +SMARTCARD_LIB_DEPENDS= libnss3.so:${PORTSDIR}/security/nss post-patch: @${REINPLACE_CMD} -e 's|/etc/gnome|${PREFIX}/etc/gnome|g' \ diff --git a/sysutils/cinnamon-settings-daemon/distinfo b/sysutils/cinnamon-settings-daemon/distinfo index c31e2997e..064c72545 100644 --- a/sysutils/cinnamon-settings-daemon/distinfo +++ b/sysutils/cinnamon-settings-daemon/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cinnamon-settings-daemon-2.2.3.tar.xz) = c8776481e9b544662edb7c340805030d1331d70381c1a1b65db681f03e47be0e -SIZE (gnome3/cinnamon-settings-daemon-2.2.3.tar.xz) = 2994112 +SHA256 (gnome3/cinnamon-settings-daemon-2.2.4.tar.xz) = 5ee1f3d3af20fdadd5a6b948be667a0968c94f99f7b5a1992f03be0e876ff414 +SIZE (gnome3/cinnamon-settings-daemon-2.2.4.tar.xz) = 2995813 -- cgit v1.2.3