summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/cinnamon-desktop/Makefile8
-rw-r--r--x11/cinnamon-menus/Makefile10
-rw-r--r--x11/cinnamon-screensaver/Makefile6
-rw-r--r--x11/cinnamon-session/Makefile6
-rw-r--r--x11/cinnamon-session/distinfo4
-rw-r--r--x11/cinnamon/Makefile20
-rw-r--r--x11/cinnamon/distinfo4
-rw-r--r--x11/cinnamon/pkg-plist1
8 files changed, 25 insertions, 34 deletions
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 22:59:01 +0800