diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2010-07-12 03:05:49 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2010-07-12 03:05:49 +0000 |
commit | 4cf208a5ff00b72176e15a05a3bcf3c5dbea6089 (patch) | |
tree | 58b4ed9c36de90a53ef580a52157150256c88684 /deskutils/cairo-dock | |
parent | - Update to 1.5.3 (diff) |
- Update to 2.1.3-9
PR: ports/147273
Submitted by: Ivan Klymenko <fidaj@ukr.net> (maintainer)
Notes
Notes:
svn path=/head/; revision=257655
Diffstat (limited to 'deskutils/cairo-dock')
-rw-r--r-- | deskutils/cairo-dock/Makefile | 28 | ||||
-rw-r--r-- | deskutils/cairo-dock/distinfo | 6 | ||||
-rw-r--r-- | deskutils/cairo-dock/files/patch-Makefile.am | 6 | ||||
-rw-r--r-- | deskutils/cairo-dock/files/patch-Makefile.in | 6 | ||||
-rw-r--r-- | deskutils/cairo-dock/files/patch-configure | 10 | ||||
-rw-r--r-- | deskutils/cairo-dock/files/patch-fetch | 33 | ||||
-rw-r--r-- | deskutils/cairo-dock/pkg-plist | 37 |
7 files changed, 96 insertions, 30 deletions
diff --git a/deskutils/cairo-dock/Makefile b/deskutils/cairo-dock/Makefile index 4a08f61396ad..c49edd22676f 100644 --- a/deskutils/cairo-dock/Makefile +++ b/deskutils/cairo-dock/Makefile @@ -6,23 +6,39 @@ # PORTNAME= cairo-dock -DISTVERSION= 2.1.0 -PORTREVISION= 2 +DISTVERSION= 2.1.3-9 CATEGORIES= deskutils -MASTER_SITES= BERLIOS +MASTER_SITES= http://launchpadlibrarian.net/44930527/ MAINTAINER= fidaj@ukr.net COMMENT= Cairo-Dock is a light and eye-candy dock -LIB_DEPENDS= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ +LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ + dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ gtkglext-x11-1.0.0:${PORTSDIR}/x11-toolkits/gtkglext GNU_CONFIGURE= yes -USE_BZIP2= yes USE_GETTEXT= yes USE_GMAKE= yes USE_GNOME= gnomehack pkgconfig glib20 gtk20 librsvg2 libxml2 USE_LDCONFIG= yes USE_XORG= xrender +MAKE_JOBS_SAFE= yes -.include <bsd.port.mk> +post-patch: + ${REINPLACE_CMD} -e 's,curl,fetch,g' ${WRKSRC}/po/*.po \ + ${WRKSRC}/data/help.conf + ${REINPLACE_CMD} -e 's,/usr,${PREFIX},g' \ + ${WRKSRC}/src/cairo-dock-gui-factory.c + +.include <bsd.port.pre.mk> + +.if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) +# Glitz support can only be enabled if cairo is built with glitz support +CONFIGURE_ARGS+=--enable-glitz +LIB_DEPENDS+= glitz:${PORTSDIR}/graphics/glitz +.else +CONFIGURE_ARGS+=--disable-glitz +.endif + +.include <bsd.port.post.mk> diff --git a/deskutils/cairo-dock/distinfo b/deskutils/cairo-dock/distinfo index c60df0764f4d..7d5f3381273a 100644 --- a/deskutils/cairo-dock/distinfo +++ b/deskutils/cairo-dock/distinfo @@ -1,3 +1,3 @@ -MD5 (cairo-dock-2.1.0.tar.bz2) = 242b1d4cc6cf9743771ca1752ad342c7 -SHA256 (cairo-dock-2.1.0.tar.bz2) = f06d84f9aa8979e352ce62ef3d80747ea05803bd671ae53cc1e92db5ad0c8389 -SIZE (cairo-dock-2.1.0.tar.bz2) = 1375614 +MD5 (cairo-dock-2.1.3-9.tar.gz) = f4b7f78770696b36efaa346df0bfa7d2 +SHA256 (cairo-dock-2.1.3-9.tar.gz) = 0629ffc55a5c075daa74908627ad5a69315c3af22051458ec9489ed64d382ae5 +SIZE (cairo-dock-2.1.3-9.tar.gz) = 2480328 diff --git a/deskutils/cairo-dock/files/patch-Makefile.am b/deskutils/cairo-dock/files/patch-Makefile.am index 3b6bbfd36a00..715162000fa8 100644 --- a/deskutils/cairo-dock/files/patch-Makefile.am +++ b/deskutils/cairo-dock/files/patch-Makefile.am @@ -1,6 +1,6 @@ ---- src/Makefile.am.orig 2010-02-03 23:18:44.000000000 +0200 -+++ src/Makefile.am 2010-02-03 23:18:54.000000000 +0200 -@@ -45,8 +45,6 @@ +--- src/Makefile.am.orig 2010-05-05 18:34:05.000000000 +0300 ++++ src/Makefile.am 2010-05-05 18:34:23.000000000 +0300 +@@ -46,8 +46,6 @@ -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ -DGL_GLEXT_PROTOTYPES=\""1"\"\ -std=c99\ diff --git a/deskutils/cairo-dock/files/patch-Makefile.in b/deskutils/cairo-dock/files/patch-Makefile.in index 52e04094b06f..56ff353cec8a 100644 --- a/deskutils/cairo-dock/files/patch-Makefile.in +++ b/deskutils/cairo-dock/files/patch-Makefile.in @@ -1,6 +1,6 @@ ---- src/Makefile.in.orig 2010-02-03 23:18:44.000000000 +0200 -+++ src/Makefile.in 2010-02-03 23:19:01.000000000 +0200 -@@ -350,8 +350,6 @@ +--- src/Makefile.in.orig 2010-05-05 18:34:41.000000000 +0300 ++++ src/Makefile.in 2010-05-05 18:34:46.000000000 +0300 +@@ -378,8 +378,6 @@ -DCAIRO_DOCK_THEMES_DIR=\""$(CAIRO_DOCK_THEMES_DIR)"\"\ -DGL_GLEXT_PROTOTYPES=\""1"\"\ -std=c99\ diff --git a/deskutils/cairo-dock/files/patch-configure b/deskutils/cairo-dock/files/patch-configure index e1b5d81ed79d..280ae877ecd5 100644 --- a/deskutils/cairo-dock/files/patch-configure +++ b/deskutils/cairo-dock/files/patch-configure @@ -1,9 +1,9 @@ ---- configure.orig 2010-01-31 18:18:42.000000000 +0200 -+++ configure 2010-01-31 18:18:52.000000000 +0200 -@@ -15044,8 +15044,8 @@ +--- configure.orig 2010-05-05 18:36:30.000000000 +0300 ++++ configure 2010-05-05 18:36:48.000000000 +0300 +@@ -13091,8 +13091,8 @@ + fi - - if test "$LIBCRYPT_LIBS" != "" ; then + if test "$LIBCRYPT_LIBS" != "" ; then - HAVE_LIBCRYPT_TRUE= - HAVE_LIBCRYPT_FALSE='#' + HAVE_LIBCRYPT_TRUE='#' diff --git a/deskutils/cairo-dock/files/patch-fetch b/deskutils/cairo-dock/files/patch-fetch new file mode 100644 index 000000000000..a2c10bc50702 --- /dev/null +++ b/deskutils/cairo-dock/files/patch-fetch @@ -0,0 +1,33 @@ +--- cairo-dock-package-theme 2010-02-13 11:55:45.000000000 +0100 ++++ cairo-dock-package-theme 2010-06-28 18:48:36.000000000 +0200 +@@ -1,3 +1,3 @@ +-#!/bin/bash ++#!/bin/sh + + # Packager for Cairo-Dock +@@ -126,5 +126,5 @@ + #\__________ On cherche si ce theme est un theme officiel ou non. + echo "un theme est present ($theme)" +- wget "$THEME_SERVER/$3/list.conf" -O "liste.tmp" -t 3 -T 30 ++ fetch -o "liste.tmp" -T 30 "$THEME_SERVER/$3/list.conf" + if test -f "liste.tmp" ; then + grep "^\[${theme}\]" "liste.tmp" +--- src/cairo-dock-themes-manager.c 2010-04-03 14:32:50.000000000 +0200 ++++ src/cairo-dock-themes-manager.c 2010-06-28 18:47:19.000000000 +0200 +@@ -143,8 +143,16 @@ + //\_______________ On lance le download. + //gchar *cCommand = g_strdup_printf ("%s wget \"%s/%s/%s\" -O \"%s\" -t %d -T %d%s", (iShowActivity == 2 ? "$TERM -e '" : ""), cServerAdress, cDistantFilePath, cDistantFileName, cTmpFilePath, CAIRO_DOCK_DL_NB_RETRY, CAIRO_DOCK_DL_TIMEOUT, (iShowActivity == 2 ? "'" : "")); ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFlyBSD__) ++ gchar *cCommand = g_strdup_printf ("/usr/bin/fetch -qo \"%s\" -T %d \"%s/%s/%s\"", ++ cTmpFilePath, ++ cServerAdress, cDistantFilePath, cDistantFileName, ++ mySystem.iConnectionTimeout); ++ cd_debug ("download with 'MaxTime' and 'NbRetries' parameters ignored with fetch(1)"); ++#else + gchar *cCommand = g_strdup_printf ("curl -s \"%s/%s/%s\" --output \"%s\" --connect-timeout %d --max-time %d --retry %d", + cServerAdress, cDistantFilePath, cDistantFileName, + cTmpFilePath, + mySystem.iConnectionTimeout, mySystem.iConnectiontMaxTime, mySystem.iConnectiontNbRetries); ++#endif + cd_debug ("download with '%s'", cCommand); + int r = system (cCommand); diff --git a/deskutils/cairo-dock/pkg-plist b/deskutils/cairo-dock/pkg-plist index 0fb5defc948e..96a20ec4e7d6 100644 --- a/deskutils/cairo-dock/pkg-plist +++ b/deskutils/cairo-dock/pkg-plist @@ -10,6 +10,7 @@ include/cairo-dock/cairo-dock/cairo-dock-applet-factory.h include/cairo-dock/cairo-dock/cairo-dock-applet-multi-instance.h include/cairo-dock/cairo-dock/cairo-dock-applet-single-instance.h include/cairo-dock/cairo-dock/cairo-dock-application-factory.h +include/cairo-dock/cairo-dock/cairo-dock-application-facility.h include/cairo-dock/cairo-dock/cairo-dock-applications-manager.h include/cairo-dock/cairo-dock/cairo-dock-callbacks.h include/cairo-dock/cairo-dock/cairo-dock-class-manager.h @@ -32,9 +33,8 @@ include/cairo-dock/cairo-dock/cairo-dock-flying-container.h include/cairo-dock/cairo-dock/cairo-dock-gauge.h include/cairo-dock/cairo-dock/cairo-dock-global-variables.h include/cairo-dock/cairo-dock/cairo-dock-graph.h -include/cairo-dock/cairo-dock/cairo-dock-gui-callbacks.h include/cairo-dock/cairo-dock/cairo-dock-gui-factory.h -include/cairo-dock/cairo-dock/cairo-dock-gui-filter.h +include/cairo-dock/cairo-dock/cairo-dock-gui-launcher.h include/cairo-dock/cairo-dock/cairo-dock-gui-manager.h include/cairo-dock/cairo-dock/cairo-dock-icons.h include/cairo-dock/cairo-dock/cairo-dock-internal-accessibility.h @@ -57,6 +57,7 @@ include/cairo-dock/cairo-dock/cairo-dock-log.h include/cairo-dock/cairo-dock/cairo-dock-menu.h include/cairo-dock/cairo-dock/cairo-dock-modules.h include/cairo-dock/cairo-dock/cairo-dock-notifications.h +include/cairo-dock/cairo-dock/cairo-dock-opengl.h include/cairo-dock/cairo-dock/cairo-dock-particle-system.h include/cairo-dock/cairo-dock/cairo-dock-renderer-manager.h include/cairo-dock/cairo-dock/cairo-dock-separator-factory.h @@ -64,13 +65,9 @@ include/cairo-dock/cairo-dock/cairo-dock-struct.h include/cairo-dock/cairo-dock/cairo-dock-surface-factory.h include/cairo-dock/cairo-dock/cairo-dock-task.h include/cairo-dock/cairo-dock/cairo-dock-themes-manager.h -lib/libcairo-dock.a -lib/libcairo-dock.la -lib/libcairo-dock.so libdata/pkgconfig/cairo-dock.pc share/locale/de/LC_MESSAGES/cairo-dock.mo share/locale/el/LC_MESSAGES/cairo-dock.mo -share/locale/en_GB/LC_MESSAGES/cairo-dock.mo share/locale/es/LC_MESSAGES/cairo-dock.mo share/locale/fr/LC_MESSAGES/cairo-dock.mo share/locale/it/LC_MESSAGES/cairo-dock.mo @@ -81,6 +78,13 @@ share/locale/pt_BR/LC_MESSAGES/cairo-dock.mo share/locale/ru/LC_MESSAGES/cairo-dock.mo share/locale/sv/LC_MESSAGES/cairo-dock.mo share/locale/zh_CN/LC_MESSAGES/cairo-dock.mo +share/locale/be/LC_MESSAGES/cairo-dock.mo +share/locale/cs/LC_MESSAGES/cairo-dock.mo +share/locale/en/LC_MESSAGES/cairo-dock.mo +share/locale/eu/LC_MESSAGES/cairo-dock.mo +share/locale/hu/LC_MESSAGES/cairo-dock.mo +share/locale/uk/LC_MESSAGES/cairo-dock.mo +share/locale/zh_TW/LC_MESSAGES/cairo-dock.mo share/applications/cairo-dock-cairo.desktop share/applications/cairo-dock.desktop %%DATADIR%%/ChangeLog.txt @@ -126,8 +130,6 @@ share/applications/cairo-dock.desktop %%DATADIR%%/gauges/Turbo-night-fuel/theme.xml %%DATADIR%%/hand.svg %%DATADIR%%/help.conf -%%DATADIR%%/help.svg -%%DATADIR%%/icon-accessibility.svg %%DATADIR%%/icon-background.svg %%DATADIR%%/icon-bubble.png %%DATADIR%%/icon-buttons.png @@ -136,7 +138,6 @@ share/applications/cairo-dock.desktop %%DATADIR%%/icon-frame.png %%DATADIR%%/icon-gradation.png %%DATADIR%%/icon-hidden-dock.png -%%DATADIR%%/icon-icons.svg %%DATADIR%%/icon-indicators.png %%DATADIR%%/icon-labels.png %%DATADIR%%/icon-lock-icons.svg @@ -146,8 +147,23 @@ share/applications/cairo-dock.desktop %%DATADIR%%/icon-subdock.png %%DATADIR%%/icon-system.png %%DATADIR%%/icon-taskbar.png -%%DATADIR%%/icon-views.svg %%DATADIR%%/icon-wave.png +%%DATADIR%%/cairo-dock-simple.conf +%%DATADIR%%/icon-close.png +%%DATADIR%%/icon-help.png +%%DATADIR%%/icon-plug-ins.png +%%DATADIR%%/icon-accessories.png +%%DATADIR%%/icon-connection.svg +%%DATADIR%%/icon-icons.png +%%DATADIR%%/icon-restore.png +%%DATADIR%%/icon-appearance.svg +%%DATADIR%%/icon-controler.png +%%DATADIR%%/icon-maximize.png +%%DATADIR%%/icon-views.png +%%DATADIR%%/icon-behavior.svg +%%DATADIR%%/icon-desktop.svg +%%DATADIR%%/icon-minimize.png +%%DATADIR%%/icon-visibility.png %%DATADIR%%/launcher.conf %%DATADIR%%/main-dock.conf %%DATADIR%%/preview-default.png @@ -162,6 +178,7 @@ share/applications/cairo-dock.desktop %%DATADIR%%/themes/_default_/cairo-dock-ok.svg %%DATADIR%%/themes/_default_/cairo-dock.conf %%DATADIR%%/themes/_default_/icons/logout.png +%%DATADIR%%/themes/_default_/icons/firefox.svg %%DATADIR%%/themes/_default_/indicator.png %%DATADIR%%/themes/_default_/launchers/01firefox.desktop %%DATADIR%%/themes/_default_/launchers/01gimp.desktop |