diff options
25 files changed, 66 insertions, 180 deletions
diff --git a/lang/cjs/Makefile b/lang/cjs/Makefile index f33067fad..d2acebc86 100644 --- a/lang/cjs/Makefile +++ b/lang/cjs/Makefile @@ -3,13 +3,12 @@ # $MCom$ PORTNAME= cjs -PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTVERSION= 2.2.1 CATEGORIES= lang gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 -MAINTAINER= gustau.perez@gmail.com +MAINTAINER= gnome@FreeBSD.org COMMENT= JavaScript bindings based on gobject-introspection BUILD_DEPENDS= gnome-autogen.sh:${PORTSDIR}/devel/gnome-common diff --git a/lang/cjs/distinfo b/lang/cjs/distinfo index 1f5c63386..937084983 100644 --- a/lang/cjs/distinfo +++ b/lang/cjs/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cjs-2.2.0.tar.gz) = 47b707bdb334305a5aa8104233e8e2679209f5b95fb7f9e153d3a66c5e6917dc -SIZE (gnome3/cjs-2.2.0.tar.gz) = 355511 +SHA256 (gnome3/cjs-2.2.1.tar.gz) = dbd6b2f3e1103d9ab5df81c3ab549b86dc1c5fe4014bf1780cf743a0132733eb +SIZE (gnome3/cjs-2.2.1.tar.gz) = 355553 diff --git a/sysutils/cinnamon-control-center/Makefile b/sysutils/cinnamon-control-center/Makefile index 30b49ff27..a4826f3b6 100644 --- a/sysutils/cinnamon-control-center/Makefile +++ b/sysutils/cinnamon-control-center/Makefile @@ -3,16 +3,15 @@ # $MCom$ PORTNAME= cinnamon-control-center -PORTVERSION= 2.2.9 -PORTREVISION= 1 +PORTVERSION= 2.2.10 CATEGORIES= sysutils gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 -MAINTAINER= gustau.perez@gmail.com +MAINTAINER= gnome@FreeBSD.org COMMENT= Control center for Cinnamon -BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ +BUILD_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \ gnome-autogen.sh:${PORTSDIR}/devel/gnome-common LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ @@ -32,9 +31,9 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libclutter-gst-2.0.so:${PORTSDIR}/multimedia/clutter-gst \ libcinnamon-menu-3.so:${PORTSDIR}/x11/cinnamon-menus \ libgjs.so:${PORTSDIR}/lang/gjs -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ +RUN_DEPENDS= py*-dbus>=0:${PORTSDIR}/devel/py-dbus \ cinnamon-settings-daemon>=0:${PORTSDIR}/sysutils/cinnamon-settings-daemon \ - ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ + ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ py*-lxml>=0:${PORTSDIR}/devel/py-lxml USES= gettext gmake libtool pathfix pkgconfig @@ -52,18 +51,11 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip +OPTIONS_SUB= yes OPTIONS_DEFINE= CUPS OPTIONS_DEFAULT=CUPS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:${PORTSDIR}/print/cups-client -PLIST_SUB+= CUPS="" -.else -CONFIGURE_ARGS+=--disable-cups -PLIST_SUB+= CUPS="@comment " -.endif +CUPS_CONFIGURE_ENABLE= cups +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client post-patch: @${REINPLACE_CMD} -e 's|find|find ${WRKSRC}/files|g' \ diff --git a/sysutils/cinnamon-control-center/distinfo b/sysutils/cinnamon-control-center/distinfo index da1414dff..6d5d38ffb 100644 --- a/sysutils/cinnamon-control-center/distinfo +++ b/sysutils/cinnamon-control-center/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cinnamon-control-center-2.2.9.tar.gz) = 76b32187298f4d934ded2a2a898c371e7644fe9f3142b41bf9acf39d11436491 -SIZE (gnome3/cinnamon-control-center-2.2.9.tar.gz) = 4852457 +SHA256 (gnome3/cinnamon-control-center-2.2.10.tar.gz) = 5bdd6570e5a2ac2bc4760f3cec5fe7240015f7de9e8756b949e301cf3a474cef +SIZE (gnome3/cinnamon-control-center-2.2.10.tar.gz) = 4855304 diff --git a/sysutils/cinnamon-control-center/pkg-plist b/sysutils/cinnamon-control-center/pkg-plist index 3240fe559..3f93cdf6c 100644 --- a/sysutils/cinnamon-control-center/pkg-plist +++ b/sysutils/cinnamon-control-center/pkg-plist @@ -278,7 +278,6 @@ share/locale/zh_TW/LC_MESSAGES/cinnamon-control-center-timezones.mo share/polkit-1/rules.d/cinnamon-control-center.rules @dirrmtry share/locale/ilo/LC_MESSAGES @dirrmtry share/locale/ilo -@dirrmtry share/desktop-directories @dirrm share/cinnamon-control-center/ui/datetime @dirrm share/cinnamon-control-center/ui @dirrm share/cinnamon-control-center/icons/hicolor/48x48/devices @@ -302,4 +301,3 @@ share/polkit-1/rules.d/cinnamon-control-center.rules @dirrm lib/cinnamon-control-center-1 @dirrm include/cinnamon-control-center-1/libcinnamon-control-center @dirrm include/cinnamon-control-center-1 -@dirrmtry etc/xdg/menus 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 <bsd.port.options.mk> - -.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 diff --git a/x11-fm/nemo/Makefile b/x11-fm/nemo/Makefile index cb2cf9d94..7a6d0f88e 100644 --- a/x11-fm/nemo/Makefile +++ b/x11-fm/nemo/Makefile @@ -3,25 +3,25 @@ # $MCom$ PORTNAME= nemo -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= x11-fm gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 -MAINTAINER= gustau.perez@gmail.com +MAINTAINER= gnome@FreeBSD.org COMMENT= File manager for the Cinnamon desktop -BUILD_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ +BUILD_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \ gtkdocize:${PORTSDIR}/textproc/gtk-doc \ py*-polib>=0:${PORTSDIR}/devel/py-polib \ 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 LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \ libcinnamon-desktop.so:${PORTSDIR}/x11/cinnamon-desktop \ libnotify.so:${PORTSDIR}/devel/libnotify \ libexempi.so:${PORTSDIR}/textproc/exempi -RUN_DEPENDS= ${LOCALBASE}/share/icons/gnome/index.theme:${PORTSDIR}/misc/gnome-icon-theme \ - ${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas +RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \ + gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas USES= desktop-file-utils gettext gmake libtool pathfix \ pkgconfig shared-mime-info diff --git a/x11-fm/nemo/distinfo b/x11-fm/nemo/distinfo index 0a44c902a..6e2efb82a 100644 --- a/x11-fm/nemo/distinfo +++ b/x11-fm/nemo/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/nemo-2.2.2.tar.gz) = 1ce04c1fb7b1a40bdfd416dab3b9ac043a7b56dbdc7c577a515651cbfa39c5df -SIZE (gnome3/nemo-2.2.2.tar.gz) = 1338500 +SHA256 (gnome3/nemo-2.2.3.tar.gz) = 21fb6bfb0c2c4764f601fe72a0588f67723d29a6a2907c17cf74fae7b801bc26 +SIZE (gnome3/nemo-2.2.3.tar.gz) = 1341842 diff --git a/x11-fm/nemo/pkg-plist b/x11-fm/nemo/pkg-plist index 378724086..7ab73de99 100644 --- a/x11-fm/nemo/pkg-plist +++ b/x11-fm/nemo/pkg-plist @@ -32,6 +32,7 @@ share/icons/hicolor/16x16/actions/nemo-eject.png share/icons/hicolor/16x16/apps/nemo.png share/icons/hicolor/22x22/apps/nemo.png share/icons/hicolor/24x24/apps/nemo.png +share/icons/hicolor/32x32/actions/nemo-eject.png share/icons/hicolor/32x32/apps/nemo.png share/icons/hicolor/scalable/actions/location-symbolic.svg share/icons/hicolor/scalable/actions/sidebar-hide-symbolic.svg diff --git a/x11-wm/muffin/Makefile b/x11-wm/muffin/Makefile index 333ee75ff..64d3bcbcc 100644 --- a/x11-wm/muffin/Makefile +++ b/x11-wm/muffin/Makefile @@ -3,13 +3,12 @@ # $MCom$ PORTNAME= muffin -PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTVERSION= 2.2.6 CATEGORIES= x11-wm gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 -MAINTAINER= gustau.perez@gmail.com +MAINTAINER= gnome@FreeBSD.org COMMENT= Compositing window manager forked from Mutter for use with Cinnamon BUILD_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 \ @@ -24,18 +23,19 @@ RUN_DEPENDS= zenity3>=3.0.0:${PORTSDIR}/x11/zenity3 USES= gettext libtool:keepla gmake pathfix pkgconfig USE_GNOME= gconf2 gnomedocutils gnomehier gnomeprefix gtk30 \ - intlhack introspection:build + introspection:build USE_AUTOTOOLS= libtoolize autoconf automake -USE_CSTD= gnu89 USE_XORG= x11 xext xrandr xcomposite xcursor xinerama ice sm USE_PYTHON= yes USE_LDCONFIG= yes +USE_CSTD= gnu89 CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -INSTALL_TARGET= install-strip +PATHFIX_MAKEFILEIN= Makefile.am CONFIGURE_ENV= LIBS="-lexecinfo" CONFIGURE_ARGS= --enable-compile-warnings=maximum GLIB_SCHEMAS= org.cinnamon.muffin.gschema.xml +INSTALL_TARGET= install-strip pre-configure: @cd ${WRKSRC} && ${SH} autogen.sh diff --git a/x11-wm/muffin/distinfo b/x11-wm/muffin/distinfo index c15bf9936..0331b5e92 100644 --- a/x11-wm/muffin/distinfo +++ b/x11-wm/muffin/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/muffin-2.2.1.tar.gz) = aec5062ca53364e5077694ef0848b7a4efe384f19d41736c2f7d86e53ce5c009 -SIZE (gnome3/muffin-2.2.1.tar.gz) = 2705007 +SHA256 (gnome3/muffin-2.2.6.tar.gz) = 5617504f5f8ecaf53268787728e6b7bf5da1514d9bc538dd0c047d467cca9ccf +SIZE (gnome3/muffin-2.2.6.tar.gz) = 2705497 diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c b/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c deleted file mode 100644 index e99a9d229..000000000 --- a/x11-wm/muffin/files/patch-src_compositor_meta-shaped-texture.c +++ /dev/null @@ -1,14 +0,0 @@ ---- src/compositor/meta-shaped-texture.c.orig 2014-03-31 10:15:32.429567385 +0000 -+++ src/compositor/meta-shaped-texture.c 2014-03-31 10:15:38.680567395 +0000 -@@ -295,10 +295,8 @@ - if (meta_texture_rectangle_check (paint_tex)) - priv->mask_texture = meta_texture_rectangle_new (tex_width, tex_height, - COGL_PIXEL_FORMAT_A_8, -- COGL_PIXEL_FORMAT_A_8, - stride, -- mask_data, -- NULL /* error */); -+ mask_data); - else - priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height, - COGL_TEXTURE_NONE, diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c deleted file mode 100644 index 12c6c27db..000000000 --- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.c +++ /dev/null @@ -1,26 +0,0 @@ ---- src/compositor/meta-texture-rectangle.c.orig 2013-11-23 13:42:35.000000000 +0000 -+++ src/compositor/meta-texture-rectangle.c 2014-03-31 08:00:34.766125773 +0000 -@@ -35,10 +35,8 @@ - meta_texture_rectangle_new (unsigned int width, - unsigned int height, - CoglPixelFormat format, -- CoglPixelFormat internal_format, - unsigned int rowstride, -- const guint8 *data, -- GError **error) -+ const guint8 *data) - { - ClutterBackend *backend = - clutter_get_default_backend (); -@@ -46,10 +44,7 @@ - clutter_backend_get_cogl_context (backend); - CoglTextureRectangle *tex_rect; - -- tex_rect = cogl_texture_rectangle_new_with_size (context, -- width, height, -- internal_format, -- error); -+ tex_rect = cogl_texture_rectangle_new_with_size (context, width, height); - if (tex_rect == NULL) - return NULL; - diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h b/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h deleted file mode 100644 index 81593c066..000000000 --- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-rectangle.h +++ /dev/null @@ -1,14 +0,0 @@ ---- src/compositor/meta-texture-rectangle.h.orig 2013-11-23 13:42:35.000000000 +0000 -+++ src/compositor/meta-texture-rectangle.h 2014-03-31 08:00:34.766125773 +0000 -@@ -34,10 +34,8 @@ - meta_texture_rectangle_new (unsigned int width, - unsigned int height, - CoglPixelFormat format, -- CoglPixelFormat internal_format, - unsigned int rowstride, -- const guint8 *data, -- GError **error); -+ const guint8 *data); - - gboolean - meta_texture_rectangle_check (CoglTexture *texture); diff --git a/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c b/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c deleted file mode 100644 index d605aece6..000000000 --- a/x11-wm/muffin/files/patch-src_compositor_meta-texture-tower.c +++ /dev/null @@ -1,16 +0,0 @@ ---- src/compositor/meta-texture-tower.c.orig 2013-11-23 13:42:35.000000000 +0000 -+++ src/compositor/meta-texture-tower.c 2014-03-31 08:00:34.767127023 +0000 -@@ -365,13 +365,9 @@ - meta_texture_rectangle_new (width, height, - /* data format */ - TEXTURE_FORMAT, -- /* internal cogl format */ -- TEXTURE_FORMAT, - /* rowstride */ - width * 4, - /* data */ -- NULL, -- /* error */ - NULL); - } - else diff --git a/x11-wm/muffin/files/patch-src_makefile.am b/x11-wm/muffin/files/patch-src_makefile.am deleted file mode 100644 index abfc0f984..000000000 --- a/x11-wm/muffin/files/patch-src_makefile.am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile.orig.am 2013-02-24 10:55:25.339517972 +0100 -+++ src/Makefile.am 2013-02-24 10:56:23.792517007 +0100 -@@ -294,7 +294,7 @@ - inlinepixbufs.h: $(IMAGES) - $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h - --pkgconfigdir = $(libdir)/pkgconfig -+pkgconfigdir = $(prefix)/libdata/pkgconfig - - pkgconfig_DATA = libmuffin.pc muffin-plugins.pc - diff --git a/x11/cinnamon-desktop/Makefile b/x11/cinnamon-desktop/Makefile index ab11c02d1..4d8d9c7cd 100644 --- a/x11/cinnamon-desktop/Makefile +++ b/x11/cinnamon-desktop/Makefile @@ -12,10 +12,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Additional UI API for cinnamon BUILD_DEPENDS= gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \ - ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \ - ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \ - ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile + xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \ + libxkbfile>=0:${PORTSDIR}/x11/libxkbfile +RUN_DEPENDS= xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \ + libxkbfile>=0:${PORTSDIR}/x11/libxkbfile USE_XORG= x11 xrandr xext USES= gettext gmake libtool pathfix pkgconfig tar:xz diff --git a/x11/cinnamon-menus/Makefile b/x11/cinnamon-menus/Makefile index 4254f1ebe..e9774e775 100644 --- a/x11/cinnamon-menus/Makefile +++ b/x11/cinnamon-menus/Makefile @@ -12,10 +12,10 @@ MAINTAINER= gnome@FreeBSD.org COMMENT= Additional UI API for cinnamon BUILD_DEPENDS= gnome-autogen.sh:${PORTSDIR}/devel/gnome-common \ - ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \ - ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xkeyboard-config.pc:${PORTSDIR}/x11/xkeyboard-config \ - ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile + xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \ + libxkbfile>=0:${PORTSDIR}/x11/libxkbfile +RUN_DEPENDS= xkeyboard-config>=0:${PORTSDIR}/x11/xkeyboard-config \ + libxkbfile>=0:${PORTSDIR}/x11/libxkbfile USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_GNOME= gnomehier gnomemenus3 gnomeprefix gtk30 intlhack \ @@ -23,7 +23,7 @@ USE_GNOME= gnomehier gnomemenus3 gnomeprefix gtk30 intlhack \ USE_PYTHON= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_AUTOTOOLS= autoconf automake libtool +USE_AUTOTOOLS= libtoolize autoconf automake PATHFIX_MAKEFILEIN= Makefile.am CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/x11/cinnamon-screensaver/Makefile b/x11/cinnamon-screensaver/Makefile index 9d6c40327..f418c0a3a 100644 --- a/x11/cinnamon-screensaver/Makefile +++ b/x11/cinnamon-screensaver/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib RUN_DEPENDS= pam_helper:${PORTSDIR}/security/pam_helper \ gsettings-desktop-schemas>=3.2.0:${PORTSDIR}/devel/gsettings-desktop-schemas \ - ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring + gnome-keyring>=0:${PORTSDIR}/security/gnome-keyring USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_XORG= x11 xext xxf86vm xxf86misc xscrnsaver @@ -39,14 +39,10 @@ post-patch: ${WRKSRC}/src/gs-auth-pam.c @${REINPLACE_CMD} -e 's|find -m|find . -m|g' \ ${WRKSRC}/files/Makefile.in -# @${REINPLACE_CMD} -e 's|@AUTH_SCHEME@|helper|g' \ -# ${WRKSRC}/src/Makefile.in @${ECHO} "#define PASSWD_HELPER_PROGRAM \"/usr/local/bin/pam_helper\"" \ >> ${WRKSRC}/config.h.in post-install: -# ${CHOWN} root ${PREFIX}/libexec/gnome-screensaver-dialog -# ${CHMOD} +s ${PREFIX}/libexec/gnome-screensaver-dialog ${INSTALL_DATA} ${WRKDIR}/cinnamon-screensaver.pam \ ${STAGEDIR}${PREFIX}/etc/pam.d/cinnamon-screensaver ${RM} -fr ${STAGEDIR}${PREFIX}/etc/pam.d/pam.d/ diff --git a/x11/cinnamon-session/Makefile b/x11/cinnamon-session/Makefile index 5d8d393ab..eb3d18ece 100644 --- a/x11/cinnamon-session/Makefile +++ b/x11/cinnamon-session/Makefile @@ -3,7 +3,7 @@ # $MCom$ PORTNAME= cinnamon-session -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 CATEGORIES= x11 gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 @@ -17,8 +17,8 @@ LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \ libupower-glib.so:${PORTSDIR}/sysutils/upower \ libcanberra.so:${PORTSDIR}/audio/libcanberra -RUN_DEPENDS= ${LOCALBASE}/sbin/console-kit-daemon:${PORTSDIR}/sysutils/consolekit \ - ${LOCALBASE}/bin/xdpyinfo:${PORTSDIR}/x11/xdpyinfo +RUN_DEPENDS= console-kit-daemon:${PORTSDIR}/sysutils/consolekit \ + xdpyinfo:${PORTSDIR}/x11/xdpyinfo USES= gettext gmake libtool pathfix pkgconfig tar:xz USE_XORG= ice sm xau xext xtst xrender xtrans xcomposite diff --git a/x11/cinnamon-session/distinfo b/x11/cinnamon-session/distinfo index e528815b1..4001ead25 100644 --- a/x11/cinnamon-session/distinfo +++ b/x11/cinnamon-session/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cinnamon-session-2.2.1.tar.xz) = 357c952e9f57072c03fce08d3fb59a345ab74a386858a4599eace29c4953cf8e -SIZE (gnome3/cinnamon-session-2.2.1.tar.xz) = 902111 +SHA256 (gnome3/cinnamon-session-2.2.2.tar.xz) = 16e94442dc8c3d666ca2b576088b7dd4b179e48a3af96ac92ac94864c1f51288 +SIZE (gnome3/cinnamon-session-2.2.2.tar.xz) = 902668 diff --git a/x11/cinnamon/Makefile b/x11/cinnamon/Makefile index 911f329e7..8d4091d8b 100644 --- a/x11/cinnamon/Makefile +++ b/x11/cinnamon/Makefile @@ -3,16 +3,15 @@ # $MCom$ PORTNAME= cinnamon -PORTVERSION= 2.2.13 -PORTREVISION= 1 +PORTVERSION= 2.2.14 CATEGORIES= x11 gnome MASTER_SITES= http://github.com/linuxmint/${PORTNAME}/archive/${PORTVERSION}.tar.gz?dummy=/ DIST_SUBDIR= gnome3 -MAINTAINER= gustau.perez@gmail.com +MAINTAINER= gnome@FreeBSD.org COMMENT= Fork of GNOME Shell with layout similar to GNOME 2 -BUILD_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ +BUILD_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gnome-autogen.sh:${PORTSDIR}/devel/gnome-common LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libcaribou.so:${PORTSDIR}/accessibility/caribou \ @@ -27,14 +26,14 @@ LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \ libcjs.so:${PORTSDIR}/lang/cjs \ libcinnamon-menu-3.so:${PORTSDIR}/x11/cinnamon-menus \ libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dbus-python.pc:${PORTSDIR}/devel/py-dbus \ - ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \ +RUN_DEPENDS= py*-dbus>=0:${PORTSDIR}/devel/py-dbus \ + ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \ gnome-themes-standard>=3.0.0:${PORTSDIR}/x11-themes/gnome-themes-standard \ cinnamon-control-center:${PORTSDIR}/sysutils/cinnamon-control-center \ cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations \ cinnamon-screensaver:${PORTSDIR}/x11/cinnamon-screensaver \ nemo:${PORTSDIR}/x11-fm/nemo \ - ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \ + py*-imaging>=0:${PORTSDIR}/graphics/py-imaging \ py*-lxml>=0:${PORTSDIR}/devel/py-lxml WRKSRC= ${WRKDIR}/Cinnamon-${PORTVERSION} @@ -60,12 +59,7 @@ INSTALL_TARGET= install-strip GLIB_SCHEMAS= org.cinnamon.gschema.xml OPTIONS_DEFINE= NLS - -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MNLS} -RUN_DEPENDS+= cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations -.endif +NLS_RUN_DEPENDS= cinnamon-translations>=0:${PORTSDIR}/misc/cinnamon-translations post-patch: @${MKDIR} ${WRKSRC}/files${PREFIX} diff --git a/x11/cinnamon/distinfo b/x11/cinnamon/distinfo index c7c84b1ee..0f4405171 100644 --- a/x11/cinnamon/distinfo +++ b/x11/cinnamon/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome3/cinnamon-2.2.13.tar.gz) = 123261a6a90954adc13f251489d708bc1b611808c63ae87c5189bf717f42483a -SIZE (gnome3/cinnamon-2.2.13.tar.gz) = 2656518 +SHA256 (gnome3/cinnamon-2.2.14.tar.gz) = ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9 +SIZE (gnome3/cinnamon-2.2.14.tar.gz) = 2656809 diff --git a/x11/cinnamon/pkg-plist b/x11/cinnamon/pkg-plist index 9d033dd91..123bd1510 100644 --- a/x11/cinnamon/pkg-plist +++ b/x11/cinnamon/pkg-plist @@ -509,6 +509,7 @@ share/applications/cinnamon2d.desktop %%DATADIR%%/js/misc/params.js %%DATADIR%%/js/misc/pointerTracker.js %%DATADIR%%/js/misc/screenSaver.js +%%DATADIR%%/js/misc/timers.js %%DATADIR%%/js/misc/util.js %%DATADIR%%/js/misc/windowUtils.js %%DATADIR%%/js/perf/core.js |